Rewrite remaining section scripts, add to wrapper