revamped and reorganized a bunch of stuff