mostly working

Signed-off-by: Andrew Miller <amiller@cs.umd.edu>