started adding support for logging