First pass at implementing epoch queue in stubs