Old map code

@mberg merge when you're ready