After a massive work on getting the application to work