moving most behaviours over to new model/implementation system