About to start on clean internals