Changed lots of things. Almost there.