Reprised all of my tests. 85% converage. Fixes #25, #26, #27, #28, #29, #30, #31, #32, #33, #34, #35, and #36.