confusion abounds

moving all of my work into the this branch because it is most up to date
probably going to make a new branch from here for cleanliness