Added all current work so far
updated rewriter