Changed all of the syntax. Kind of a big deal. Still needs some work.