make more stuff pass, keep organizing