More commenting and retabbing. Slowly working through more of the functionality