Made tacobot more OO