changed the TODO items i am never going to do
better error checking props to @ericmann for the catch