Even more cleanup.
Add some goals.