Dev khemry

Updating the remaining sample app code.