Hacky classpath fix, really need to #16 soon...