did another refactor of the models to get rid of unreal dependencies