Added majority of features.