Working commit of Harsh's App