fucking big update

needs testing - should test it on a bunch of fucking cunts