Redo the application
Update with a clear/fine suite of code