Updating git with further sprint 2 and 3 progress.