Merged some code from Brian so that it builds on the bot.
5 files changed