Treasury: Initial commit (pt 2)