getting close... a few more to-dos...