This is fantastic! Keep on the good work! I am looking at this with great interest.
I believe keeping the tooling separate and enabling them on demand totally makes sense.