First pull request : scrum updates

Scrum updates and other functionality