about to do code refactor
about to tidy updateFeatures
stabilized