Fixed dependency hell I think. Phase I Complete
bugfix