#31 Map loading handles errors
 #31 Compiles cleanly with proper formatting