Logging and Testing added, logging is missing the config file and testing is missing the integration test yet, not sure if necessary