Nice idea, but probably too much work for the benefit. / #805