Teams

I'm opening it early for quick reviews. Please do not merge.