Classpath fix for me
Fixed classpath maybe
Fixed merge errors in World