Super commit! Finish phase IV;
Add owner and cat associations.