Working on adding enables to each state TODO: only add to  correct state