Add logging
WIP