Unless you have a plan for the signatures let's get rid of them and simplify this a bit.