Currently reworking EVERYTHING

This will take some time.. but there weren't interesting things here anyway.