Pre-Merge Commit

Commiting my current progress in preparation for a merge.