Getting there, more aggressive bot and better encapsulation