Committ before a potentially big rewrite to GUICONTROLLER