major edits, midnight commit.