Commit after starter milestone 6