All tests passing again. Let me know what you think of the changes :D