Teamwork

Proposing architectural changes