completing features work (I hope...)