Long term TODOs Implement logging Robust error/exception handling Complete CancellationToken support Update entities Check and fix any race conditions