Forgot to remove testing value. (+2 squashed commits)
Squashed commits:
[0be5abd] Moved some things around a little, and fixed something I borked in another queue.
[1898fbb] Implemented changes as discussed in PR.