This is an initial change commit containing all debug messages still
Further code trimming will happen very soon