Disjointed commit

Took a break for awhile and unfortunately forgot to commit, so I'm not totally
sure what changes are what.