What's holding your hands for not doing it!!!

PQC can be implemented now and by that you close the subject from now , so why you are waiting for. 

QBlock can do that

https://github.com/QBlockQ

best regards