Finished implementing part 2 of complex feature.