More updates to controller, map now used in maphandler