some more TODO
saturday evening update