Little bit of cleanup. Why wasn't I using latch in the first place. Man this code is old and decrepit.