Forgot to commit map.cpp