Added remaining logic-control functions and events. Few remaining issues with logic before UI pieces can come together