validated info
pre d3 and refactoring commit
Begin major refactoring.