Updated classpathes
Continuing to work on implementing features