refactored a bunch of code with constants, started work on bouncer