Changed my mind and move logging back into DSL