Reintegrating Ricardo K's code

There were no errors on my side after starting the application, but then
again, I can't get past the starting screen.