Added the app .. but still buggy