Resolving conflicts with last commit

Replacing all files with Brett's First round of BETA edits commit