Overhaul old data system with new abstracted java 8 interfaces