Commented out generator call, making way for DB class dev.