Big Refactoring Tx API - Updated

This Pull Request differs from #43 in that it was not merged with the experimental OGM hacks branch, and is merged with 'big-refactoring-2012'.