Add some logic to the app...huehue
Merge