Just ran around, adding TODO's.