Added 2/4 files from frankc & psteiner