ian's first solo commit
ian edited formatting