Final commit in class
Merge (and ignore Jon's changes)