Renamed some stuff, trying to add more detailed error handling
adds renamed app