[WIP] Systems  & hierarchy

**DO NOT MERGE UNTIL #18 IS MERGED**