Nearly Complete

Final stages of formatting