made a bunch of changes. Still need to make a bunch more.