Initial work

As discussed maybe consider not exposing this, but as limited api instead