diff --git a/neuron/presynapse.md b/neuron/presynapse.md
index 4eb7d20..a4b5953 100644
--- a/neuron/presynapse.md
+++ b/neuron/presynapse.md
@@ -160,7 +160,8 @@ Questo serve per il medio/lungo periodo
 ```Gen
 container: PRESYNAPSE
 
-  expansion: VGCC-PRE ( full: 10x, active: 5x, empty: 2x )
+  expansion: 
+    - VGCC-PRE ( full: 10x, active: 5x, empty: 2x )
 
   tub_local:
     - Ca2+ ( full: 60x, active: 30x, empty: 0x )
@@ -177,7 +178,7 @@ container: PRESYNAPSE
     - eCB ( contained_by: POST ) 
 
   context_intricated:
-  - AP ( contained_by: SOMA ) 
+  - AP_ctx ( contained_by: SOMA ) 
 ```
 
 ### AP_ctx: PRESYNAPSE
@@ -202,7 +203,6 @@ In tutti i casi di NT
 
 ```Gen
 NTreleaseLow: ( active: 12x ) # Low
-
   type: accumulator
   contained_by: PRESYNAPSE
 
@@ -217,32 +217,30 @@ NTreleaseLow: ( active: 12x ) # Low
 In tutti i casi di NT
 
 ```Gen
-interacting: NTreleaseMedium
+NTreleaseMedium: ( active: 9x ) # Medium
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 9x ) # Medium
-
-  hypothesis: (( Ca2+ fullness ) AND ( Rrp mediumness ) OR 
-              ( Ca2+ mediumness ) AND ( Rrp fullness )) AND
-              NOT( ATP empty )
-    action: [Rrp decrease, Nt increase, ATP decrease]
-    trace: None
+    hypothesis: (( Ca2+ fullness ) AND ( Rrp mediumness ) OR 
+                ( Ca2+ mediumness ) AND ( Rrp fullness )) AND
+                NOT( ATP empty )
+      action: [Rrp decrease, Nt increase, ATP decrease]
+      trace: None
 ```
 
 #### NTreleaseHigh: int: ms
 
 ```Gen
-interacting: NTreleaseHigh
+NTreleaseHigh: ( active: 3x ) # High
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 3x ) # High
-
-  hypothesis: ( Ca2+ fullness ) AND ( Rrp fullness )  AND 
-              NOT( ATP empty )
-    action: [Rrp decrease, NT increase, ATP decrease]
-    trace: None
+    hypothesis: ( Ca2+ fullness ) AND ( Rrp fullness )  AND 
+                  NOT( ATP empty )
+        action: [Rrp decrease, NT increase, ATP decrease]
+        trace: None
 ```
 
 #### Ca2+TracesAccumulationLow: int: ms
@@ -259,44 +257,41 @@ Serve a:
 ---
 
 ```Gen
-interacting: Ca2+TracesAccumulationLow
+Ca2+TracesAccumulationLow: ( active: 10x )
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 10x )
-
-  hypothesis: (Ca2+ emptiness)
-    action: [CaTraceLow increase]
-    trace: None
+    hypothesis: (Ca2+ emptiness)
+      action: [CaTraceLow increase]
+      trace: None
 ```
 
 #### Ca2+TracesAccumulationMedium: int: ms
 
 ```Gen
-interacting: Ca2+TracesAccumulationMedium
+Ca2+TracesAccumulationMedium: ( active: 6x ) # medium
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 10x )
-
-  hypothesis: (Ca2+ mediumness)
-    action: [CaTraceMed increase]
-    trace: None
+    hypothesis: (Ca2+ mediumness)
+      action: [CaTraceMed increase]
+      trace: None
 ```
 
 #### Ca2+TracesAccumulationHigh: int: ms
 
 
 ```Gen
-interacting: Ca2+TracesAccumulationHigh
+Ca2+TracesAccumulationHigh: ( active: 10x ) # high
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 10x ) # high
-
-  hypothesis: (Ca2+ fullness)
-    action: [CaTraceHigh increase]
-    trace: None
+    hypothesis: (Ca2+ fullness)
+      action: [CaTraceHigh increase]
+      trace: None
 ```
 
 ### NOT AP_ctx: PRESYNAPSE
@@ -308,15 +303,14 @@ eCB dipende da POST. Tende a modulare l'entrata di Ca2+ degli VGCC.
 Qui non facciamo un flush di eCB, riduciamo ogni mezzo secondo (context) di un RF di questo episodio.
 
 ```Gen
-interacting: eCBClearance
+eCBClearance: ( active: 24x ) # Slow
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx
-  rf: ( active: 24x ) # Slow
-
-  hypothesis: NOT (eCB empty)
-    action: [eCB decrease]
-    trace: None
+    hypothesis: NOT (eCB empty)
+      action: [eCB decrease]
+      trace: None
 ```
 
 #### RPShuttleLow: int: sec
@@ -328,17 +322,16 @@ The "Hard Bottleneck" State. Recruitment is throttled by a lack of signal, a lac
 Rate: 0.00 – 0.25
 
 ```Gen
-interacting: RPShuttleLow
+RPShuttleLow: ( active: 48x ) # Low
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx
-  rf: ( active: 48x ) # Low
-
-  hypothesis: (CaTraceLow fullness) OR 
-              (RP emptiness) OR 
-              (RRP fullness)  
-    action: [RP decrease, RRP increase]
-    trace: None
+    hypothesis: (CaTraceLow fullness) OR 
+                (RP emptiness) OR 
+                (RRP fullness)  
+      action: [RP decrease, RRP increase]
+      trace: None
 ```
 
 #### RPShuttleMedium: int: sec
@@ -348,18 +341,17 @@ The "Sub-Optimal" State. The machinery is working, but it's held back by partial
 Rate: 0.50 – 0.97
 
 ```Gen
-interacting: RPShuttleMedium
+RPShuttleMedium: ( active: 24x ) # Medium
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 24x ) # Medium
-
-  hypothesis: (CaTraceMedium fullness) AND (RP mediumness) AND (RRP mediumness) OR 
-              (CaTraceHigh fullness) AND (RP mediumness) AND (RRP mediumness) OR # signal boost
-              (CaTraceMedium fullness) AND (RP fullness) AND (RRP mediumness) OR # supply boost
-              (CaTraceMedium fullness) AND (RP mediumness) AND (RRP emptiness) # vacancy boost
-    action: [RP decrease, RRP increase]
-    trace: None
+    hypothesis: (CaTraceMedium fullness) AND (RP mediumness) AND (RRP mediumness) OR 
+                (CaTraceHigh fullness) AND (RP mediumness) AND (RRP mediumness) OR # signal boost
+                (CaTraceMedium fullness) AND (RP fullness) AND (RRP mediumness) OR # supply boost
+                (CaTraceMedium fullness) AND (RP mediumness) AND (RRP emptiness) # vacancy boost
+      action: [RP decrease, RRP increase]
+      trace: None
 ```
 
 #### RPShuttleHigh: int: sec
@@ -369,17 +361,16 @@ The "High Performance" State. Multiple systems are optimized, but one is still a
 Rate: 1.25 – 1.94
 
 ```Gen
-interacting: RPShuttleHigh
+RPShuttleHigh: ( active: 12x ) # Fast
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: AP_ctx
-  rf: ( active: 12x ) # Fast
-
-  hypothesis: (CaTraceHigh fullness) AND (RP fullness) AND (RRP mediumness) OR # signal + supply
-              (CaTraceHigh fullness) AND (RP mediumness) AND (RRP emptiness) OR # signal + vacancy
-              (CaTraceMedium fullness) AND (RP fullness) AND (RRP emptiness) # supply + vacancy
-    action: [RP decrease, RRP increase]
-    trace: None
+    hypothesis: (CaTraceHigh fullness) AND (RP fullness) AND (RRP mediumness) OR # signal + supply
+                (CaTraceHigh fullness) AND (RP mediumness) AND (RRP emptiness) OR # signal + vacancy
+                (CaTraceMedium fullness) AND (RP fullness) AND (RRP emptiness) # supply + vacancy
+      action: [RP decrease, RRP increase]
+      trace: None
 ```
 
 #### RefillRPGlutamine: int: min
@@ -419,32 +410,30 @@ Each tier buys time for the one below it to respond. When all three are depleted
 Qui facciamo un flush di CaTraceX. Deve essere fatto a valle del tuning.
 
 ```Gen
-interacting: Ca2+TracesClearance
+Ca2+TracesClearance: ( active: 30x ) # Slow
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: NOT TunPossible_ctx
-  rf: ( active: 30x ) # Slow
+    hypothesis: NOT (CaTraceHigh empty)
+      action: [CaTRaceHigh decrease]
+      trace: None
 
-  hypothesis: NOT (CaTraceHigh empty)
-    action: [CaTRaceHigh decrease]
-    trace: None
+    hypothesis: NOT (CaTraceMedium empty)
+      action: [CaTRaceMedium decrease]
+      trace: None
 
-  hypothesis: NOT (CaTraceMedium empty)
-    action: [CaTRaceMedium decrease]
-    trace: None
-
-  hypothesis: NOT (CaTraceLow empty)
-    action: [CaTRaceLow decrease]
-    trace: None
+    hypothesis: NOT (CaTraceLow empty)
+      action: [CaTRaceLow decrease]
+      trace: None
 ```
 
 ## VGCC-PRE-TUN: Tuner
 
 ```Gen
-tuner: VGCC-PRE-TUN
-
+VGCC-PRE-TUN
+  type: tuner
   # qui stiamo aggiungendo o eliminando VGCC-PRE. Fra un massimo full e minimo empty (empty puo' non essere 0)
-
   # contained_by: PRESYNAPSE non e' contenuto, si attacca.
 
   tunes: PRESYNAPSE/expansion/VCGG-PRE
@@ -467,45 +456,42 @@ tuner: VGCC-PRE-TUN
 Qui controlliamo che ci siano le condizioni per aumentare o diminuire la quantita' di VGCC
 
 ```Gen
-contexting: CheckVgccPreTun
+CheckVgccPreTun: ( active: 60x )
+  type: contexting
   contained_by: VGCC-PRE-TUN
 
   in_context: TunPossible_ctx
-  rf: ( active: 60x )
+    condition:  ( CaTraceHigh fullness )
+      out_context: TryTunUpPreVcgg_ctx
 
-  condition:  ( CaTraceHigh fullness )
-    out_context: TryTunUpPreVcgg_ctx
-
-  condition:  ( CaTraceLow fullness )
-    out_context: TryTunDownPreVcgg_ctx
+    condition:  ( CaTraceLow fullness )
+      out_context: TryTunDownPreVcgg_ctx
 ```
 
 #### PossibleUpPreVgccTun: int: sec
 
 ```Gen
-interacting: PossibleUpPreVgccTun
+PossibleUpPreVgccTun: ( active: 10x )
+  type: accumulator
   contained_by: VGCC-PRE-TUN
 
   in_context: TryTunUpPreVcgg_ctx
-  rf: ( active: 10x )
-
- hypothesis:  
-  action: 
-  trace: 
+    hypothesis:  
+      action: 
+      trace: 
 ```
 
 #### PossibleDownPreVgccTun: int: sec
 
 ```Gen
-interacting: PossibleDownPreVgccTun
+PossibleDownPreVgccTun: ( active: 10x )
+  type: accumulator
   contained_by: VGCC-PRE-TUN
 
   in_context: TryTunDownPreVcgg_ctx
-  rf: ( active: 10x )
-
- hypothesis:  
-  action: 
-  trace: 
+    hypothesis:  
+      action: 
+      trace: 
 ```
 
 ## VGCC-PRE: Container
@@ -513,7 +499,8 @@ interacting: PossibleDownPreVgccTun
 Voltage-Controlled Gated Channels: Qui per ora non gestiamo l'evoluzione della depolarizzazione. Alla scomparsa dell'AP, i VGCC smettono di funzionare.
 
 ```Gen
-container: VGCC-PRE
+VGCC-PRE
+  type: container
 
   tub_intricated:
     - Ca2+ ( contained_by: PRESYNAPSE )
@@ -548,46 +535,43 @@ Qui semplifichiamo:
 Devo controllare che le condizioni sotto siano esaustive. Qui ho confuso high con low, e inoltre ho messo NT per mGluR che devo controllare che abbia senso.
 
 ```Gen
-interacting: Ca2+enterLow
+Ca2+enterLow: ( active: 12x ) # Low
+  type: accumulator
   contained_by: VGCC-PRE
 
   in_context: AP_ctx
-  rf: ( active: 12x ) # Low
-
-  hypothesis: (Ca2+ empty) AND (eCB empty)
-    action: [Ca2+ increase, ATP decrease]
-    trace: None
+    hypothesis: (Ca2+ empty) AND (eCB empty)
+      action: [Ca2+ increase, ATP decrease]
+      trace: None
 ```
 
 #### Ca2+enterMedium: int: ms
 
 ```Gen
-interacting: Ca2+enterMedium
+Ca2+enterMedium: ( active: 6x ) # Medium
+  type: accumulator
   contained_by: VGCC-PRE
 
   in_context: AP_ctx
-  rf: ( active: 6x ) # Medium
-
-  hypothesis: (Ca2+ mediumness) OR 
-              ((eCB mediumness) AND (Ca2+ empty)) OR 
-              ((eCB full) AND (Ca2+ empty) AND (NT empty))
-    action: [Ca2+ increase, ATP decrease]
-    trace: None
+    hypothesis: (Ca2+ mediumness) OR 
+                ((eCB mediumness) AND (Ca2+ empty)) OR 
+                ((eCB full) AND (Ca2+ empty) AND (NT empty))
+      action: [Ca2+ increase, ATP decrease]
+      trace: None
 ```
 
 #### Ca2+enterHigh: int: ms
 
 ```Gen
-interacting: Ca2+enterHigh
+Ca2+enterHigh: ( active: 3x ) # High
+  type: accumulator
   contained_by: VGCC-PRE
 
   in_context: AP_ctx
-  rf: ( active: 3x ) # High
-
-  hypothesis: (Ca2+ mediumness) AND (eCB full) OR 
-              (eCB mediumness)
-    action: [Ca2+ increase, ATP decrease]
-    trace: None
+    hypothesis: (Ca2+ mediumness) AND (eCB full) OR 
+                (eCB mediumness)
+      action: [Ca2+ increase, ATP decrease]
+      trace: None
 ```
 
 ### NOT AP_ctx: VGCC-PRE
@@ -607,27 +591,27 @@ Qui disinguiamo:
 - da capire se serve veramente questa distinzione per il tempo di svuotamento.
 
 ```Gen
-interacting: Ca2+ClearanceLow
+Ca2+ClearanceLow: ( active: 24x ) # Low
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx
-  rf: ( active: 24x ) # Low
-
-  hypothesis: (NOT Ca2+ fullness) AND (NOT Ca2+ empty) 
-    action: [Ca2+ decrease]
-    trace: None
+    hypothesis: (NOT Ca2+ fullness) AND (NOT Ca2+ empty) 
+      action: [Ca2+ decrease]
+      trace: None
 ```
 
 #### Ca2+ClearanceHigh: int: ms
 
 ```Gen
-interacting: Ca2+ClearanceHigh
+Ca2+ClearanceHigh: ( active: 4x ) # High
+  type: accumulator
   contained_by: PRESYNAPSE
 
   in_context: NOT AP_ctx
-  rf: ( active: 4x ) # High
+    hypothesis: NOT (Ca2+ empty)
+      action: [Ca2+ decrease]
+      trace: None
+```
 
-  hypothesis: NOT (Ca2+ empty)
-    action: [Ca2+ decrease]
-    trace: None