Effects Rewrite

For review.