refactoring continues 5/16/2014