Work toward enabling separated control element

(Not finished)