That sounds good. It's a framework we can build around and get something up in a hurry. Then when there's time later on, we can rebuild everything from scratch. But having some sort of rights in place now is important, even if it's just paper, or thin air. Cleaning it down to the surface would be great, nice call.
As long as we have the rights to life, liberty, the pursuit of happiness, free speech, and bearing arms, we're half way there already. Of course, we then need to claim and protect and exercise them, too.