Mostly all working; Occasional bug but hard to repro; Need to cleanup