Abstraction fixes to Team Project