reorganized and deleted a bunch of stuff