Boss 3 working

- Also renamed some variables
- This is a pain in the ass