lost of udpate and refactoring to get the app ready for hybrib implementation