More classpath work
Fix booboo in assignment