Welcome to our little corner of the net.
As Murdoch has said please share the codes and we will give our opinions.
There is a best practice guide available on the electrical safety first website for Eicrs which maybe a usefull reference guide for you.