Trying to fix classpath issues on new machine

Moving towards being able to do a blank install