Refactor, bug squash.