Updating PatrickR branch to new scaffolding