more migration, some unfinished design problems that I am too sleepy to address