Addtobot

Fixed merge conflicts, other stuff