put away codes and add some loggers