Finally finished the variable percentage stuff