Uncycle dependency 2

Cyclic dependency insanity time!