More robust app

Making the application a little more realistic.