Some work on the admin quote command