Testing for the new guard registration system is almost finished.
It is very complex to add this functionality without breaking anything.