Rputt work

Merging in todays additions.