Converted Transaction to class
Merge branch 'transaction2class'
Added variable for formatting place