MAJOR update..
and here I mean.. REALLY MAJOR