Pushing from bot, added lib and a few extras