Done refractoring. App is up and working again.