Ticking off items on #59
A little more.
I think thats all of #59
Minor
Closes #59