Added map controller not sure about keeping it yet