will push this up to a branch - I think this will all work when we get the live log subscription in