big refactoring
skipping the testing of a method bit me. d'oh