Testing to Master

Testing has not broken anything nor produced any major bugs.