Add a new layer in form validation

While I'm here update bundle.data and do everything within a transaction.