Pretty much done

Signed-off-by: Joseph Lee <monleezy@cat.pdx.edu>