Fix
Clean up of whole application. A lot of things from the hackaton still remain, Ill get to cleaning those up soon.