Converted more of tacobot to OO