Review Issue # 65 and broke circular dependencies.