more tweaking to get the full stack all the way to the client