Setup the dependencies the right way around!!!