features.py still problematic, just adding the stuff alexey said in case his grab this to continue fixing