working test, horrendously ugly but should suffice for now

conservative types refactor
Merge pull request #3 from bitemyapp/master

working test, horrendously ugly but should suffice for now