Continued work on transactions controller