Added rough ADD-SF. Trouble with NIL handling.