minor structural changes - waiting on classes from other collaborators