Ready to Test

This code is ready to be tested, don't expect it to work, but there
isn't much more we can do without actually running it on the bot