Added files from ufcommon.  Still need to clean up...