Ugly hacking :) Adds basic waitingSince functionality.