Changes

- Lacking full changes, although most pushed
- Lots of useless code, we'll fix that on our next go at it