Added handlebar functionality but we still have to change it for people