Logs added. Can we leave the object dodgy'ish b/c thing for another PR? Because it's not really related to introducing the framework stuff anyhow. And would mean it's separated out if we ever needed to revert it