Working APP with a few bugs