Bouncer refactor finish