reorder some defs
handwavy notes