Slowly moving towards a new Delegate system.

With less code duplication and seperate delegates for each model.