Making it more like a 'REAL' app