einstein went missing
started refactor of main app code