11/13 code review

test coverage is seriously in the red guys, I'd recommend putting together some user stories to address this