Initial work on @molenzwiebel's modules and map handling