Monday Night 2

Final commit for the night.