Better inheritance structure.
Added another map, for to mess with warping.