almost done with #67
YAY for this: close #67