start adding Dan's stuff