smoothing out server-side api calls after #40