Pull request for delays

Didn't realize I never PR'd this.


... Haven't done much.


... Still gotta do the saves conversion.