Yanked out a bunch of stuff, figuring out what I need to put back in