Closes #39 - finished parent/child relationships