Flesh out feature set