Migrate to state composites

This migrates to core #287

created merge request !19 (closed) to address this issue

mentioned in merge request !19 (closed)

mentioned in merge request !21 (merged)

closed via merge request !21 (merged)

mentioned in commit be21f328