Good enough for now. Add pruning fixes later.