Added more subPropertyOf assertions to match those we already make in the textual comments.
Added super/sub properties. Code has some redundancy but reasonably clear.
TODOs