moving some code over to BOT

tracking bot 0-10-dev branch