fixing critical bug. overwhelmed by desire to do a major refactor. refactoring... <smacks self in face> stash refactor, revert, fix bug.