#248 Started implementation.