Split commands out some more