Added app code and updates