Cleaned up training (optimized) and added new Connection paradigm