Nick's Work

Awesome, Nick! Merging your work over to master.