Tidying up and set up Mixture for local dev