rework architecture in prep for remote users