done sloppy Sally rewrite

now to finish readthrough