Added more ifdefs. Can now turn each component off properly.
String pots give anomalous results. Different to if they are tested seperately.
Revert "Added more ifdefs. Can now turn each component off properly."

This reverts commit f5037f74f474897b08c8104310d1600ae47ab2ed.
Revert "Revert "Added more ifdefs. Can now turn each component off properly.""

This reverts commit 25eb0abbce44f34773c5484c773b2675a8abff65.