Final Push Two

Comments, refactoring