Add major features, there are still some kinks left so this is not complete yet, but first priority is to get the scores on these features first