The administration did not go as far as some had urged in consolidating all of the government 's banking agencies into a single regulator , although it calls for merging the functions of the Office of Thrift Supervision and the comptroller 's office into a single agency .