Update Tailor Class

Check for empty queue so we don't block
Update how we shut down