Finish up #66