Got all updatey things done

* Now to continue with feats generator unit tests