Done with second milestone, and passing TransactionTest