Progress commit

Class function clean up and lots of steps added.