Working on getting rid of the last putToks call.