Part of the huge rewrite

Totally missed two files.