Closes #79. Hopefully. Need more testing to see if systematic offset between my result and autoz/runz.