Removing buggy code, startinng on config subsys.
Clean it all up