merge attempt

Awesome job! Go ahead and merge this back into master.