First pass at teams. Still a lot to do.