huge architectural client change #11
introduced entity systems