partway through implementation of mass conservation, may not work