making sure that everything is up to date on github, still needs a code review probably though