Smart creation working. Map refactored
Still needs to fix the Map dimensions