Newstuff

Merging newstuff into master, o'erwriting it all