Working app, but not as clean as i would like