Rewrote the app to implement the features we discussed over mail