Now really packing all the basic functionality on a test map