oops. missed a couple things. this should actually do it for us now. addresses #490