ENH:Finish part of controller and datastructure