more definitions done, need to finalise where defs are sourced from, prefer not to use matrix relations if possible