Completed the POC for app