Retab/everything except external

Rspecs all pass, everything looks good to me.