Added map/unmap implementation.
Added rudimentary map options.