Just doing some work to try to resolve the classpath issues still.