playing with some test code for the mapnificent api
Resolved merge conflicts