Major update 2

Adding support for a map