generic waiter added
bankrupt commit: reorganize/refactor