Cleaned up initial working distributed