re-doing some work

Redoing some work now that I have the eclipse patch running so I can
use Java 8 features
project without errors

committing project without errors