Start implementing database transactions
Merge branch 'extra' into exercise-5-6