adding some tests - and thinking of ones we need to write
not sure i really want to be comitting this file..
merging