Clean up and test before meeting with Josh Davis
merge trouble, this shit is dumb