Finished adding first round of features.