Changed map around, made methods for unit