No. I havent touched the maps, leaving the  implementation for @Dlong88