Awesome new code

Ready for deploy, test passed.