begin refactoring w/jquery