removed code from project for demo and added in TODOs