Further Progress

More is done on the last commit style. Still work to be done though.