Made a new testing branch

Changes from last night, made into a new testing branch.