Fix delegation. Re-organise to tidy up