Added percentage calculation and filled out class
stuff