Major changes to parser / game domain classes