B e

Model updated. Database connection DRY'ed up.