Merge new_stuff into master

Combine the "new_stuff" branch into the master branch.