WIP. added a buggy delay management