move logging stuff around