moved to service
cleaned up imports. tested: app crashes less