Holy crap, some work is done
Huge update