Merging my work on the bot implementation