Switch to status field for transaction
Add check for dangling transactions