Teams

resolves #16 
resolves #34
resolves #35