Added version to underscore
Renamed test thing
Added map stuff - still rough