saving some stuff for 1610 in the repo