App now fully functional