First working version since complete java 8 re-factor