erased junk - starting rewrite