cleaned up base controller, added teams