Added sources from other PC
Removed Java 8 futures