upgraded, controllers work, resuming dev