ocd
add timestamps, refactor queueing logic