Closes #54

This was really the only major difference and it worked.
Forgot to pull first.

I am an idiot.