First cut
Working version
Small adjustments
merged with feature_nondim