diff --git a/CPU9bits_tb_behav.wcfg b/CPU9bits_tb_behav.wcfg
index 40abd4d..fbb7e7a 100644
--- a/CPU9bits_tb_behav.wcfg
+++ b/CPU9bits_tb_behav.wcfg
@@ -3,249 +3,165 @@
    <wave_state>
    </wave_state>
    <db_ref_list>
-      <db_ref path="CPU9bits_tb_behav.wdb" id="1">
+      <db_ref path="CPU9bits_behav.wdb" id="1">
          <top_modules>
-            <top_module name="CPU9bits_tb" />
+            <top_module name="CPU9bits" />
             <top_module name="glbl" />
          </top_modules>
       </db_ref>
    </db_ref_list>
    <zoom_setting>
-      <ZoomStartTime time="179098989fs"></ZoomStartTime>
-      <ZoomEndTime time="282180203fs"></ZoomEndTime>
-      <Cursor1Time time="265000000fs"></Cursor1Time>
+      <ZoomStartTime time="0fs"></ZoomStartTime>
+      <ZoomEndTime time="108547643fs"></ZoomEndTime>
+      <Cursor1Time time="58257000fs"></Cursor1Time>
    </zoom_setting>
    <column_width_setting>
       <NameColumnWidth column_width="188"></NameColumnWidth>
-      <ValueColumnWidth column_width="96"></ValueColumnWidth>
+      <ValueColumnWidth column_width="92"></ValueColumnWidth>
    </column_width_setting>
-   <WVObjectSize size="11" />
-   <wvobject fp_name="/CPU9bits_tb/clk" type="logic">
-      <obj_property name="ElementShortName">clk</obj_property>
-      <obj_property name="ObjectShortName">clk</obj_property>
-   </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/reset" type="logic">
+   <WVObjectSize size="6" />
+   <wvobject fp_name="/CPU9bits/reset" type="logic">
       <obj_property name="ElementShortName">reset</obj_property>
       <obj_property name="ObjectShortName">reset</obj_property>
    </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/done" type="logic">
-      <obj_property name="ElementShortName">done</obj_property>
-      <obj_property name="ObjectShortName">done</obj_property>
-   </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/CPU9bits0/instr" type="array">
-      <obj_property name="ElementShortName">instr[8:0]</obj_property>
-      <obj_property name="ObjectShortName">instr[8:0]</obj_property>
-      <obj_property name="Radix">BINARYRADIX</obj_property>
-   </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/CPU9bits0/FetchU/AddrOut" type="array">
-      <obj_property name="ElementShortName">AddrOut[8:0]</obj_property>
-      <obj_property name="ObjectShortName">AddrOut[8:0]</obj_property>
-      <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-   </wvobject>
-   <wvobject fp_name="group429" type="group">
+   <wvobject fp_name="group740" type="group">
       <obj_property name="label">Registers</obj_property>
       <obj_property name="DisplayName">label</obj_property>
-      <obj_property name="isExpanded"></obj_property>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/RF/r0_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/RF/reset" type="logic">
+         <obj_property name="ElementShortName">reset</obj_property>
+         <obj_property name="ObjectShortName">reset</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/RF/op0_idx" type="array">
+         <obj_property name="ElementShortName">op0_idx[1:0]</obj_property>
+         <obj_property name="ObjectShortName">op0_idx[1:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/RF/op1_idx" type="array">
+         <obj_property name="ElementShortName">op1_idx[1:0]</obj_property>
+         <obj_property name="ObjectShortName">op1_idx[1:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/RF/write_data" type="array">
+         <obj_property name="ElementShortName">write_data[8:0]</obj_property>
+         <obj_property name="ObjectShortName">write_data[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/RF/op0" type="array">
+         <obj_property name="ElementShortName">op0[8:0]</obj_property>
+         <obj_property name="ObjectShortName">op0[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/RF/op1" type="array">
+         <obj_property name="ElementShortName">op1[8:0]</obj_property>
+         <obj_property name="ObjectShortName">op1[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/RF/r0_out" type="array">
          <obj_property name="ElementShortName">r0_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r0_out[8:0]</obj_property>
-         <obj_property name="label">RegisterA</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/RF/r1_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/RF/r1_out" type="array">
          <obj_property name="ElementShortName">r1_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r1_out[8:0]</obj_property>
-         <obj_property name="label">RegisterB</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/RF/r2_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/RF/r2_out" type="array">
          <obj_property name="ElementShortName">r2_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r2_out[8:0]</obj_property>
-         <obj_property name="label">RegisterC</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/RF/r3_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/RF/r3_out" type="array">
          <obj_property name="ElementShortName">r3_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r3_out[8:0]</obj_property>
-         <obj_property name="label">RegisterD</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
    </wvobject>
-   <wvobject fp_name="group430" type="group">
+   <wvobject fp_name="group741" type="group">
       <obj_property name="label">Banks</obj_property>
       <obj_property name="DisplayName">label</obj_property>
-      <obj_property name="isExpanded"></obj_property>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/Bank/r0_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/Bank/reset" type="logic">
+         <obj_property name="ElementShortName">reset</obj_property>
+         <obj_property name="ObjectShortName">reset</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/write_index" type="array">
+         <obj_property name="ElementShortName">write_index[1:0]</obj_property>
+         <obj_property name="ObjectShortName">write_index[1:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/op0_idx" type="array">
+         <obj_property name="ElementShortName">op0_idx[1:0]</obj_property>
+         <obj_property name="ObjectShortName">op0_idx[1:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/op1_idx" type="array">
+         <obj_property name="ElementShortName">op1_idx[1:0]</obj_property>
+         <obj_property name="ObjectShortName">op1_idx[1:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/write_data" type="array">
+         <obj_property name="ElementShortName">write_data[8:0]</obj_property>
+         <obj_property name="ObjectShortName">write_data[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/op0" type="array">
+         <obj_property name="ElementShortName">op0[8:0]</obj_property>
+         <obj_property name="ObjectShortName">op0[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/op1" type="array">
+         <obj_property name="ElementShortName">op1[8:0]</obj_property>
+         <obj_property name="ObjectShortName">op1[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/decOut" type="array">
+         <obj_property name="ElementShortName">decOut[3:0]</obj_property>
+         <obj_property name="ObjectShortName">decOut[3:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/Bank/r0_out" type="array">
          <obj_property name="ElementShortName">r0_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r0_out[8:0]</obj_property>
-         <obj_property name="label">Bank0</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/Bank/r1_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/Bank/r1_out" type="array">
          <obj_property name="ElementShortName">r1_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r1_out[8:0]</obj_property>
-         <obj_property name="label">Bank1</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/Bank/r2_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/Bank/r2_out" type="array">
          <obj_property name="ElementShortName">r2_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r2_out[8:0]</obj_property>
-         <obj_property name="label">Bank2</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/Bank/r3_out" type="array">
-         <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/Bank/r3_out" type="array">
          <obj_property name="ElementShortName">r3_out[8:0]</obj_property>
          <obj_property name="ObjectShortName">r3_out[8:0]</obj_property>
-         <obj_property name="label">Bank3</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
       </wvobject>
    </wvobject>
    <wvobject type="divider" fp_name="divider431">
       <obj_property name="label">Divider</obj_property>
       <obj_property name="DisplayName">label</obj_property>
    </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory" type="array">
+   <wvobject fp_name="group728" type="group">
+      <obj_property name="label">Instruction Memory</obj_property>
       <obj_property name="DisplayName">label</obj_property>
-      <obj_property name="ElementShortName">memory[23:0][8:0]</obj_property>
-      <obj_property name="ObjectShortName">memory[23:0][8:0]</obj_property>
+      <wvobject fp_name="/CPU9bits/iM/address" type="array">
+         <obj_property name="ElementShortName">address[8:0]</obj_property>
+         <obj_property name="ObjectShortName">address[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/iM/readData" type="array">
+         <obj_property name="ElementShortName">readData[8:0]</obj_property>
+         <obj_property name="ObjectShortName">readData[8:0]</obj_property>
+      </wvobject>
+      <wvobject fp_name="/CPU9bits/iM/memory" type="array">
+         <obj_property name="DisplayName">label</obj_property>
+         <obj_property name="ElementShortName">memory[100:0][8:0]</obj_property>
+         <obj_property name="ObjectShortName">memory[100:0][8:0]</obj_property>
+         <obj_property name="label">Instruction Memory</obj_property>
+      </wvobject>
+   </wvobject>
+   <wvobject fp_name="group729" type="group">
       <obj_property name="label">Data Memory</obj_property>
-      <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      <obj_property name="isExpanded"></obj_property>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[23]" type="array">
-         <obj_property name="ElementShortName">[23][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[23][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
+      <obj_property name="DisplayName">label</obj_property>
+      <wvobject fp_name="/CPU9bits/dM/address" type="array">
+         <obj_property name="ElementShortName">address[8:0]</obj_property>
+         <obj_property name="ObjectShortName">address[8:0]</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[22]" type="array">
-         <obj_property name="ElementShortName">[22][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[22][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
+      <wvobject fp_name="/CPU9bits/dM/writeData" type="array">
+         <obj_property name="ElementShortName">writeData[8:0]</obj_property>
+         <obj_property name="ObjectShortName">writeData[8:0]</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[21]" type="array">
-         <obj_property name="ElementShortName">[21][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[21][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
+      <wvobject fp_name="/CPU9bits/dM/readData" type="array">
+         <obj_property name="ElementShortName">readData[8:0]</obj_property>
+         <obj_property name="ObjectShortName">readData[8:0]</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[20]" type="array">
-         <obj_property name="ElementShortName">[20][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[20][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
+      <wvobject fp_name="/CPU9bits/dM/memory" type="array">
+         <obj_property name="DisplayName">label</obj_property>
+         <obj_property name="ElementShortName">memory[100:0][8:0]</obj_property>
+         <obj_property name="ObjectShortName">memory[100:0][8:0]</obj_property>
+         <obj_property name="label">Data Memory</obj_property>
       </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[19]" type="array">
-         <obj_property name="ElementShortName">[19][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[19][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[18]" type="array">
-         <obj_property name="ElementShortName">[18][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[18][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[17]" type="array">
-         <obj_property name="ElementShortName">[17][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[17][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[16]" type="array">
-         <obj_property name="ElementShortName">[16][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[16][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[15]" type="array">
-         <obj_property name="ElementShortName">[15][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[15][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[14]" type="array">
-         <obj_property name="ElementShortName">[14][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[14][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[13]" type="array">
-         <obj_property name="ElementShortName">[13][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[13][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[12]" type="array">
-         <obj_property name="ElementShortName">[12][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[12][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[11]" type="array">
-         <obj_property name="ElementShortName">[11][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[11][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[10]" type="array">
-         <obj_property name="ElementShortName">[10][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[10][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[9]" type="array">
-         <obj_property name="ElementShortName">[9][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[9][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[8]" type="array">
-         <obj_property name="ElementShortName">[8][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[8][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[7]" type="array">
-         <obj_property name="ElementShortName">[7][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[7][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[6]" type="array">
-         <obj_property name="ElementShortName">[6][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[6][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[5]" type="array">
-         <obj_property name="ElementShortName">[5][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[5][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[4]" type="array">
-         <obj_property name="ElementShortName">[4][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[4][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[3]" type="array">
-         <obj_property name="ElementShortName">[3][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[3][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[2]" type="array">
-         <obj_property name="ElementShortName">[2][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[2][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[1]" type="array">
-         <obj_property name="ElementShortName">[1][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[1][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-      <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/memory[0]" type="array">
-         <obj_property name="ElementShortName">[0][8:0]</obj_property>
-         <obj_property name="ObjectShortName">[0][8:0]</obj_property>
-         <obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
-      </wvobject>
-   </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/CPU9bits0/dM/readData" type="array">
-      <obj_property name="ElementShortName">readData[8:0]</obj_property>
-      <obj_property name="ObjectShortName">readData[8:0]</obj_property>
-   </wvobject>
-   <wvobject fp_name="/CPU9bits_tb/CPU9bits0/FetchU/AddrIn" type="array">
-      <obj_property name="ElementShortName">AddrIn[8:0]</obj_property>
-      <obj_property name="ObjectShortName">AddrIn[8:0]</obj_property>
    </wvobject>
 </wave_config>