this is going to make it way harder to merge but whatever need to get heroku working