Working on adding a logger...