Modified and rewrote app to proper specifications
Additional modifications