Revert "Commit after starter milestone 6"

This reverts commit 74c1eb6e0612e590c2e9a82de07d3aa64bb2d39c.
Revert "Revert "Commit after starter milestone 6""

This reverts commit 8ca1c998133988dfbfd31fba9ace9edfba0667d5.