#92 write unit test for mapper,  fix types,  make non-abstract,  things like that.