A bunch of changes. Still doesn't work.