Ra857

Changes made via Kate's Suggestions. App is in a stable position. Minor things should be changed, a.k.a labels, name changes, etc.