Getting closer to a full version