Committing sprint 3

Preparing to get into spring 4