OldAPI implementation
no message
Merge branch 'map-integration' of https://github.com/MortenBirk/PP2 into map-integration