Attempting to resolve dependancy weirdness