Version 3

Complete refactor, including percentages