halfway through insane rewrite - am I really doing this?