Gut and clean. Now just base model for extension.