Update Controllers and Such
Finish demo app