MAJOR re-indenting. Almost every line changed.