Some first code view preparations (still pretty broken)