Mostly working.  Need to work on runtime classpath