FE #4 Implemented first version of the map