Restore Tmp Directory

ww3 version of previous pull. 

Note: This also brings ww3 up to date with develop, which is why there are so many commits.