Lots and lots of edits...this is a bad commit message.