Begin onf the nolog part + slight interface changes
Merge conflicts