More changes, still a commit or two away from getting full prologue done