Beta

Merge Beta into master. Will require conflict resolution for a few files.