Implement new Model
Remove old hooks, add new