Began work on config
Changed controller state system