rip out a lot of stuff, add other things