Added: logging
Added: testing