Huge DB Commit in progress. #40