initial commit of framework/application branch