Map model added -- tests written and game model/tests updated