Rewrite of the app from scratch