CYKLO-927 Cleanup and leave one small change, incrementAlways? That's kinda silly but seems like its working. Passes my tests but I'm not 100% my testing method is correct.