TIdying up cruft
Interfacces code baseline
Interfacces code baseline