synced models to use the new normaliser abstraction
looking good