Getting somewhere with the bugs

Signed-off-by: daitoshokan <gknoble@ucsc.edu>