some progress on automating includes