Trying to resolve these freaking dependencies