major changes to jut about everything...