Major Changes

Changed everything too many to list