SurajC/BrentonM : Adding maps and map testing