major edits, morning commit.