initial commit
clean up for new project merge