WIP Removed circular dependency

Now I need to go hog-wild refactoring