Lots of bugs being squashed here

#4 and #5 so far