refs #66 done