Added initial aspect definitions, but awaiting fixes or clarifications from Chris and Dave