Continued working.

Signed-off-by: Nathaniel Roth <neroth@ucdavis.edu>