Added demo controllers and TODOs