hp merge changes; mostly new files.