Feature/proper logging