This is a non-working push, just to keep track of the updates and share stuff, do NOT merge this!
It will criple everything and fuck up for sure!!!!

DO NOT MERGE!!!