Working App. Made a few improvements.