Sorting out the packages so it all works on Windows