Move Singularity into the Java 8 Future

Not ready for merge yet, but this has my current Java 8 changes.
reorder changes?