refs #32 #35 #36 done