Lots and lots of changes

More  w i l l  come.. soon