Start on map drawing and clean up files