Most of day two.
Final commit