WIP: Worked on fixing circular dependencies.