Goofed up some stuff by merging incorrectly. should work now