Oki doki, I'll refactor accordingly and re-commit.