Just reverted back my app a bit, don't think I can make it achieve what
I want it to do by tomorrow so I'm presenting it as is.