Fixed #111, found new bug. Now need to fix slicing, which I also broke.