Dev

shouldve organized this better initially, but going to try and get the master branch to be stable, then add another branch to merge from dev to for testing