Refactor so that closure is into specials
Merge specials and functions