That works for me!
Now we just have to switch out the template and connect functions, while everyone is sleeping, call it v3.0 and pretend nothing happened.