Partial for #18 the app crash no longer happens refactored the code a bit