I look for them to just form another agency down the road to replace the ATF. The Federal motto: Can't have too many Bureaucracies!
All we need is the FBI and the CIA. One Foreign one Domestic. Now here is where it becomes tricky so pay attention DC. Agencies within the Big Brother. The FBI could have a branch of DEA, ATF, and HLS. The CIA could have all the abbreviations they want but, here's the kicker, controlled by one branch under the auspices of the Attorney General. Oh! One more thing, not this Attorney General, the next Attorney General!