First commit- all changes made at MapAction Hackathon