Refactored relationships between the classes still builds but does nothing impressive yet.