complete first import of features from @dan-zeman