WIP: Control breakup

Fixes #20