Almost done with second part of complex feature.