Add changes to new_stuff

Either merge with the new_stuff branch first, or merge with master after merging in new_stuff.