Index: doc/proposals/concurrency/Makefile
===================================================================
--- doc/proposals/concurrency/Makefile	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/Makefile	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -22,4 +22,5 @@
 	monitor \
 	ext_monitor \
+	int_monitor \
 }}
 
Index: doc/proposals/concurrency/annex/local.bib
===================================================================
--- doc/proposals/concurrency/annex/local.bib	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/annex/local.bib	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -39,2 +39,15 @@
 	title 	= {Intel Thread Building Blocks},
 }
+
+@manual{www-cfa,
+	keywords 	= {Cforall},
+	title 	= {Cforall Programmming Language},
+	address	= {https://plg.uwaterloo.ca/~cforall/}
+}
+
+@article{rob-thesis,
+	keywords 	= {Constructors, Destructors, Tuples},
+	author	= {Rob Schluntz},
+	title 	= {Resource Management and Tuples in Cforall},
+	year		= 2017
+}
Index: doc/proposals/concurrency/figures/int_monitor.fig
===================================================================
--- doc/proposals/concurrency/figures/int_monitor.fig	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
+++ doc/proposals/concurrency/figures/int_monitor.fig	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -0,0 +1,125 @@
+#FIG 3.2  Produced by xfig version 3.2.5c
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 600.000 2625.000 600 2325 300 2625 600 2925
+6 3225 4500 7425 4800
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3375 4650 80 80 3375 4650 3455 4730
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4725 4650 105 105 4725 4650 4830 4755
+1 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6225 4650 105 105 6225 4650 6330 4755
+4 0 -1 0 0 0 12 0.0000 2 135 1035 4950 4725 blocked task\001
+4 0 -1 0 0 0 12 0.0000 2 135 870 3525 4725 active task\001
+4 0 -1 0 0 0 12 0.0000 2 180 930 6450 4725 routine ptrs\001
+-6
+6 8445 1695 8655 1905
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 8550 1800 105 105 8550 1800 8655 1905
+4 1 -1 0 0 0 10 0.0000 2 75 75 8550 1860 a\001
+-6
+6 8445 1395 8655 1605
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 8550 1500 105 105 8550 1500 8655 1605
+4 1 -1 0 0 0 10 0.0000 2 105 90 8550 1560 b\001
+-6
+6 3945 1695 4155 1905
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4050 1800 105 105 4050 1800 4155 1905
+4 1 -1 0 0 0 10 0.0000 2 75 75 4050 1860 a\001
+-6
+6 3945 1395 4155 1605
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4050 1500 105 105 4050 1500 4155 1605
+4 1 -1 0 0 0 10 0.0000 2 105 90 4050 1560 b\001
+-6
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 7650 3675 80 80 7650 3675 7730 3755
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 3675 80 80 3150 3675 3230 3755
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3900 1950 4200 2100
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
+	 3000 4050 1800 4050 1800 1950 3900 1950 3900 1350
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
+	 7800 4050 9000 4050 9000 3150 9600 3150 9600 2850 9000 2850
+	 9000 1950 8700 1950 8700 1350
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8400 1950 8700 2100
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
+	 3300 4050 4500 4050 4500 3150 5100 3150 5100 2850 4500 2850
+	 4500 1950 4200 1950 4200 1350
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
+	 7500 4050 6300 4050 6300 1950 8400 1950 8400 1350
+2 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
+	 8400 3300 8400 2400 6900 2400 6900 3300 8400 3300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9000 2850 8850 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7500 4050 7800 4200
+2 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
+	 3900 3300 3900 2400 2400 2400 2400 3300 3900 3300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4500 2850 4350 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3000 4050 3300 4200
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 600 2925 1350 2925
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 600 2325 1350 2325
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 1350 2625 1425 2850
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 1350 2325 1275 2550
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 600 2625 1350 2625
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 1350 2775 1275 2645 1125 2645 1050 2775 1125 2905 1275 2905
+	 1350 2775
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 975 2775 900 2645 750 2645 675 2775 750 2905 900 2905
+	 975 2775
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 4800 3000 4725 2870 4575 2870 4500 3000 4575 3130 4725 3130
+	 4800 3000
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 5100 3000 5025 2870 4875 2870 4800 3000 4875 3130 5025 3130
+	 5100 3000
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 9300 3000 9225 2870 9075 2870 9000 3000 9075 3130 9225 3130
+	 9300 3000
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 9600 3000 9525 2870 9375 2870 9300 3000 9375 3130 9525 3130
+	 9600 3000
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 675 2775 975 2775
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 1050 2775 1350 2775
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 4875 4950 4800 4820 4650 4820 4575 4950 4650 5080 4800 5080
+	 4875 4950
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4575 4950 4875 4950
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 3525 4970 3450 4840 3300 4840 3225 4970 3300 5100 3450 5100
+	 3525 4970
+4 1 -1 0 0 0 12 0.0000 2 135 315 2850 4275 exit\001
+4 1 -1 0 0 0 12 0.0000 2 135 315 7350 4275 exit\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 9150 2325 acceptor/\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 9150 2550 signalled\001
+4 0 -1 0 0 0 12 0.0000 2 135 420 9150 2775 stack\001
+4 1 -1 0 0 0 12 0.0000 2 135 525 7650 2775 shared\001
+4 1 -1 0 0 0 12 0.0000 2 135 735 7650 3075 variables\001
+4 1 -1 0 0 0 12 0.0000 2 135 495 8550 1275 queue\001
+4 1 -1 0 0 0 12 0.0000 2 165 420 8550 1125 entry\001
+4 0 -1 0 0 0 12 0.0000 2 135 630 8850 1575 order of\001
+4 0 -1 0 0 0 12 0.0000 2 135 525 8850 1725 arrival\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 4650 2325 acceptor/\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 4650 2550 signalled\001
+4 0 -1 0 0 0 12 0.0000 2 135 420 4650 2775 stack\001
+4 1 -1 0 0 0 12 0.0000 2 135 525 3150 2775 shared\001
+4 1 -1 0 0 0 12 0.0000 2 135 735 3150 3075 variables\001
+4 0 -1 0 0 0 12 0.0000 2 135 525 4350 1725 arrival\001
+4 0 -1 0 0 0 12 0.0000 2 135 630 4350 1500 order of\001
+4 1 -1 0 0 0 12 0.0000 2 135 495 4050 1275 queue\001
+4 1 -1 0 0 0 12 0.0000 2 165 420 4050 1050 entry\001
+4 0 0 50 -1 0 11 0.0000 2 120 705 450 2250 Condition\001
+4 0 0 50 -1 0 11 0.0000 2 165 630 3600 5025 signalled\001
+4 0 0 50 -1 0 11 0.0000 2 165 525 4950 5025 waiting\001
Index: doc/proposals/concurrency/figures/int_monitor.fig.bak
===================================================================
--- doc/proposals/concurrency/figures/int_monitor.fig.bak	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
+++ doc/proposals/concurrency/figures/int_monitor.fig.bak	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -0,0 +1,125 @@
+#FIG 3.2  Produced by xfig version 3.2.5c
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 0 0 600.000 2625.000 600 2325 300 2625 600 2925
+6 3225 4500 7425 4800
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3375 4650 80 80 3375 4650 3455 4730
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4725 4650 105 105 4725 4650 4830 4755
+1 3 0 1 -1 -1 0 0 4 0.000 1 0.0000 6225 4650 105 105 6225 4650 6330 4755
+4 0 -1 0 0 0 12 0.0000 2 135 1035 4950 4725 blocked task\001
+4 0 -1 0 0 0 12 0.0000 2 135 870 3525 4725 active task\001
+4 0 -1 0 0 0 12 0.0000 2 180 930 6450 4725 routine ptrs\001
+-6
+6 8445 1695 8655 1905
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 8550 1800 105 105 8550 1800 8655 1905
+4 1 -1 0 0 0 10 0.0000 2 75 75 8550 1860 a\001
+-6
+6 8445 1395 8655 1605
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 8550 1500 105 105 8550 1500 8655 1605
+4 1 -1 0 0 0 10 0.0000 2 105 90 8550 1560 b\001
+-6
+6 3945 1695 4155 1905
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4050 1800 105 105 4050 1800 4155 1905
+4 1 -1 0 0 0 10 0.0000 2 75 75 4050 1860 a\001
+-6
+6 3945 1395 4155 1605
+1 3 0 1 -1 -1 0 0 -1 0.000 1 0.0000 4050 1500 105 105 4050 1500 4155 1605
+4 1 -1 0 0 0 10 0.0000 2 105 90 4050 1560 b\001
+-6
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 7650 3675 80 80 7650 3675 7730 3755
+1 3 0 1 -1 -1 0 0 20 0.000 1 0.0000 3150 3675 80 80 3150 3675 3230 3755
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3900 1950 4200 2100
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
+	 3000 4050 1800 4050 1800 1950 3900 1950 3900 1350
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
+	 7800 4050 9000 4050 9000 3150 9600 3150 9600 2850 9000 2850
+	 9000 1950 8700 1950 8700 1350
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8400 1950 8700 2100
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 9
+	 3300 4050 4500 4050 4500 3150 5100 3150 5100 2850 4500 2850
+	 4500 1950 4200 1950 4200 1350
+2 1 0 1 -1 -1 0 0 -1 0.000 0 0 -1 0 0 5
+	 7500 4050 6300 4050 6300 1950 8400 1950 8400 1350
+2 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
+	 8400 3300 8400 2400 6900 2400 6900 3300 8400 3300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9000 2850 8850 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7500 4050 7800 4200
+2 2 1 1 -1 -1 0 0 -1 4.000 0 0 0 0 0 5
+	 3900 3300 3900 2400 2400 2400 2400 3300 3900 3300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4500 2850 4350 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3000 4050 3300 4200
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 600 2925 1350 2925
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 600 2325 1350 2325
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 1350 2625 1425 2850
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 1350 2325 1275 2550
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 600 2625 1350 2625
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 1350 2775 1275 2645 1125 2645 1050 2775 1125 2905 1275 2905
+	 1350 2775
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 975 2775 900 2645 750 2645 675 2775 750 2905 900 2905
+	 975 2775
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 4800 3000 4725 2870 4575 2870 4500 3000 4575 3130 4725 3130
+	 4800 3000
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 5100 3000 5025 2870 4875 2870 4800 3000 4875 3130 5025 3130
+	 5100 3000
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 9300 3000 9225 2870 9075 2870 9000 3000 9075 3130 9225 3130
+	 9300 3000
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 9600 3000 9525 2870 9375 2870 9300 3000 9375 3130 9525 3130
+	 9600 3000
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 675 2775 975 2775
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 1050 2775 1350 2775
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 4875 4950 4800 4820 4650 4820 4575 4950 4650 5080 4800 5080
+	 4875 4950
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4575 4950 4875 4950
+2 3 0 1 0 7 50 -1 -1 0.000 0 0 0 0 0 7
+	 3525 4970 3450 4840 3300 4840 3225 4970 3300 5100 3450 5100
+	 3525 4970
+4 1 -1 0 0 0 12 0.0000 2 135 315 2850 4275 exit\001
+4 1 -1 0 0 0 12 0.0000 2 135 315 7350 4275 exit\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 9150 2325 acceptor/\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 9150 2550 signalled\001
+4 0 -1 0 0 0 12 0.0000 2 135 420 9150 2775 stack\001
+4 1 -1 0 0 0 12 0.0000 2 135 525 7650 2775 shared\001
+4 1 -1 0 0 0 12 0.0000 2 135 735 7650 3075 variables\001
+4 1 -1 0 0 0 12 0.0000 2 135 495 8550 1275 queue\001
+4 1 -1 0 0 0 12 0.0000 2 165 420 8550 1125 entry\001
+4 0 -1 0 0 0 12 0.0000 2 135 630 8850 1575 order of\001
+4 0 -1 0 0 0 12 0.0000 2 135 525 8850 1725 arrival\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 4650 2325 acceptor/\001
+4 0 -1 0 0 0 12 0.0000 2 180 750 4650 2550 signalled\001
+4 0 -1 0 0 0 12 0.0000 2 135 420 4650 2775 stack\001
+4 1 -1 0 0 0 12 0.0000 2 135 525 3150 2775 shared\001
+4 1 -1 0 0 0 12 0.0000 2 135 735 3150 3075 variables\001
+4 0 -1 0 0 0 12 0.0000 2 135 525 4350 1725 arrival\001
+4 0 -1 0 0 0 12 0.0000 2 135 630 4350 1500 order of\001
+4 1 -1 0 0 0 12 0.0000 2 135 495 4050 1275 queue\001
+4 1 -1 0 0 0 12 0.0000 2 165 420 4050 1050 entry\001
+4 0 0 50 -1 0 11 0.0000 2 120 705 450 2250 Condition\001
+4 0 0 50 -1 0 11 0.0000 2 165 630 3600 5025 signalled\001
+4 0 0 50 -1 0 11 0.0000 2 165 525 4950 5025 waiting\001
Index: doc/proposals/concurrency/style/cfa-format.tex
===================================================================
--- doc/proposals/concurrency/style/cfa-format.tex	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/style/cfa-format.tex	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -166,5 +166,5 @@
   xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
   moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
-  morekeywords=[2]{accept, signal, signal_block, wait},
+  morekeywords=[2]{accept, signal, signal_block, wait, waitfor},
 }
 
Index: doc/proposals/concurrency/text/basics.tex
===================================================================
--- doc/proposals/concurrency/text/basics.tex	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/text/basics.tex	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -1,5 +1,5 @@
 % ======================================================================
 % ======================================================================
-\chapter{Basics}
+\chapter{Basics}\label{basics}
 % ======================================================================
 % ======================================================================
@@ -13,5 +13,5 @@
 
 \section{Coroutines: A stepping stone}\label{coroutine}
-While the main focus of this proposal is concurrency and parallelism, as mentionned above it is important to adress coroutines, which are actually a significant underlying aspect of a concurrency system. Indeed, while having nothing todo with parallelism and arguably little to do with concurrency, coroutines need to deal with context-switchs and and other context-management operations. Therefore, this proposal includes coroutines both as an intermediate step for the implementation of threads, and a first class feature of \CFA. Furthermore, many design challenges of threads are at least partially present in designing coroutines, which makes the design effort that much more relevant. The core API of coroutines revolve around two features: independent call stacks and \code{suspend}/\code{resume}.
+While the main focus of this proposal is concurrency and parallelism, as mentionned above it is important to adress coroutines, which are actually a significant underlying aspect of a concurrency system. Indeed, while having nothing to do with parallelism and arguably little to do with concurrency, coroutines need to deal with context-switchs and other context-management operations. Therefore, this proposal includes coroutines both as an intermediate step for the implementation of threads, and a first class feature of \CFA. Furthermore, many design challenges of threads are at least partially present in designing coroutines, which makes the design effort that much more relevant. The core API of coroutines revolve around two features: independent call stacks and \code{suspend}/\code{resume}.
 
 Here is an example of a solution to the fibonnaci problem using \CFA coroutines:
@@ -21,29 +21,29 @@
 	};
 
-	void ?{}(Fibonacci* this) { // constructor
-	      this->fn = 0;
+	void ?{}(Fibonacci & this) { // constructor
+	      this.fn = 0;
 	}
 
 	// main automacically called on first resume
-	void main(Fibonacci* this) {
+	void main(Fibonacci & this) {
 		int fn1, fn2; 		// retained between resumes
-		this->fn = 0;
-		fn1 = this->fn;
+		this.fn = 0;
+		fn1 = this.fn;
 		suspend(this); 		// return to last resume
 
-		this->fn = 1;
+		this.fn = 1;
 		fn2 = fn1;
-		fn1 = this->fn;
+		fn1 = this.fn;
 		suspend(this); 		// return to last resume
 
 		for ( ;; ) {
-			this->fn = fn1 + fn2;
+			this.fn = fn1 + fn2;
 			fn2 = fn1;
-			fn1 = this->fn;
+			fn1 = this.fn;
 			suspend(this); 	// return to last resume
 		}
 	}
 
-	int next(Fibonacci* this) {
+	int next(Fibonacci & this) {
 		resume(this); // transfer to last suspend
 		return this.fn;
@@ -53,5 +53,5 @@
 		Fibonacci f1, f2;
 		for ( int i = 1; i <= 10; i += 1 ) {
-			sout | next(&f1) | next(&f2) | endl;
+			sout | next( f1 ) | next( f2 ) | endl;
 		}
 	}
@@ -106,7 +106,7 @@
 	};
 
-	void ?{}(Fibonacci* this) {
-	      this->fn = 0;
-		(&this->c){};
+	void ?{}(Fibonacci & this) {
+	      this.fn = 0;
+		(this.c){};
 	}
 \end{cfacode}
@@ -126,5 +126,5 @@
 \subsection{Alternative: Lamda Objects}
 
-For coroutines as for threads, many implementations are based on routine pointers or function objects\cit. For example, Boost implements coroutines in terms of four functor object types: 
+For coroutines as for threads, many implementations are based on routine pointers or function objects\cit. For example, Boost implements coroutines in terms of four functor object types:
 \begin{cfacode}
 asymmetric_coroutine<>::pull_type
@@ -132,8 +132,8 @@
 symmetric_coroutine<>::call_type
 symmetric_coroutine<>::yield_type
-\end{cfacode} 
-Often, the canonical threading paradigm in languages is based on function pointers, pthread being one of the most well known examples. The main problem of this approach is that the thread usage is limited to a generic handle that must otherwise be wrapped in a custom type. Since the custom type is simple to write in \CFA and solves several issues, added support for routine/lambda based coroutines adds very little. 
-
-A variation of this would be to use an simple function pointer in the same way pthread does for threads : 
+\end{cfacode}
+Often, the canonical threading paradigm in languages is based on function pointers, pthread being one of the most well known examples. The main problem of this approach is that the thread usage is limited to a generic handle that must otherwise be wrapped in a custom type. Since the custom type is simple to write in \CFA and solves several issues, added support for routine/lambda based coroutines adds very little.
+
+A variation of this would be to use an simple function pointer in the same way pthread does for threads :
 \begin{cfacode}
 void foo( coroutine_t cid, void * arg ) {
@@ -152,13 +152,13 @@
 \subsection{Alternative: Trait-based coroutines}
 
-Finally the underlying approach, which is the one closest to \CFA idioms, is to use trait-based lazy coroutines. This approach defines a coroutine as anything that satisfies the trait \code{is_coroutine} and is used as a coroutine is a coroutine. 
+Finally the underlying approach, which is the one closest to \CFA idioms, is to use trait-based lazy coroutines. This approach defines a coroutine as anything that satisfies the trait \code{is_coroutine} and is used as a coroutine.
 
 \begin{cfacode}
 trait is_coroutine(dtype T) {
-      void main(T * this);
-      coroutine_desc * get_coroutine(T * this);
-};
-\end{cfacode}
-This ensures an object is not a coroutine until \code{resume} (or \code{prime}) is called on the object. Correspondingly, any object that is passed to \code{resume} is a coroutine since it must satisfy the \code{is_coroutine} trait to compile. The advantage of this approach is that users can easily create different types of coroutines, for example, changing the memory foot print of a coroutine is trivial when implementing the \code{get_coroutine} routine. The \CFA keyword \code{coroutine} only has the effect of implementing the getter and forward declarations required for users to only have to implement the main routine. 
+      void main(T & this);
+      coroutine_desc * get_coroutine(T & this);
+};
+\end{cfacode}
+This ensures an object is not a coroutine until \code{resume} (or \code{prime}) is called on the object. Correspondingly, any object that is passed to \code{resume} is a coroutine since it must satisfy the \code{is_coroutine} trait to compile. The advantage of this approach is that users can easily create different types of coroutines, for example, changing the memory foot print of a coroutine is trivial when implementing the \code{get_coroutine} routine. The \CFA keyword \code{coroutine} only has the effect of implementing the getter and forward declarations required for users to only have to implement the main routine.
 
 \begin{center}
@@ -174,9 +174,9 @@
 };
 
-static inline 
-coroutine_desc * get_coroutine( 
-	struct MyCoroutine * this 
+static inline
+coroutine_desc * get_coroutine(
+	struct MyCoroutine & this
 ) {
-	return &this->__cor;
+	return &this.__cor;
 }
 
@@ -186,8 +186,8 @@
 \end{center}
 
-
+The combination of these two approaches allows users new to concurrency to have a easy and concise method while more advanced users can expose themselves to otherwise hidden pitfalls at the benefit of tighter control on memory layout and initialization.
 
 \section{Thread Interface}\label{threads}
-The basic building blocks of multi-threading in \CFA are \glspl{cfathread}. Both use and kernel threads are supported, where user threads are the concurrency mechanism and kernel threads are the parallel mechanism. User threads offer a flexible and lightweight interface. A thread can be declared using a struct declaration \code{thread} as follows:
+The basic building blocks of multi-threading in \CFA are \glspl{cfathread}. Both user and kernel threads are supported, where user threads are the concurrency mechanism and kernel threads are the parallel mechanism. User threads offer a flexible and lightweight interface. A thread can be declared using a struct declaration \code{thread} as follows:
 
 \begin{cfacode}
@@ -199,7 +199,7 @@
 \begin{cfacode}
 trait is_thread(dtype T) {
-      void ^?{}(T* mutex this);
-      void main(T* this);
-      thread_desc* get_thread(T* this);
+      void ^?{}(T & mutex this);
+      void main(T & this);
+      thread_desc* get_thread(T & this);
 };
 \end{cfacode}
@@ -209,5 +209,5 @@
 	thread foo {};
 
-	void main(foo* this) {
+	void main(foo & this) {
 		sout | "Hello World!" | endl;
 	}
@@ -223,11 +223,11 @@
 
 	//ctor
-	void ?{}(FuncRunner* this, voidFunc inFunc) {
-		func = inFunc;
+	void ?{}(FuncRunner & this, voidFunc inFunc) {
+		this.func = inFunc;
 	}
 
 	//main
-	void main(FuncRunner* this) {
-		this->func();
+	void main(FuncRunner & this) {
+		this.func();
 	}
 \end{cfacode}
@@ -239,5 +239,5 @@
 thread World;
 
-void main(thread World* this) {
+void main(World & this) {
 	sout | "World!" | endl;
 }
@@ -257,52 +257,52 @@
 
 \begin{cfacode}
-	thread MyThread {
-		//...
-	};
-
-	//main
-	void main(MyThread* this) {
-		//...
-	}
-
-	void foo() {
-		MyThread thrds[10];
-		//Start 10 threads at the beginning of the scope
+thread MyThread {
+	//...
+};
+
+//main
+void main(MyThread & this) {
+	//...
+}
+
+void foo() {
+	MyThread thrds[10];
+	//Start 10 threads at the beginning of the scope
+
+	DoStuff();
+
+	//Wait for the 10 threads to finish
+}
+\end{cfacode}
+
+However, one of the apparent drawbacks of this system is that threads now always form a lattice, that is they are always destroyed in opposite order of construction because of block structure. However, storage allocation is not limited to blocks; dynamic allocation can create threads that outlive the scope in which the thread is created much like dynamically allocating memory lets objects outlive the scope in which they are created
+
+\begin{cfacode}
+thread MyThread {
+	//...
+};
+
+//main
+void main(MyThread & this) {
+	//...
+}
+
+void foo() {
+	MyThread * long_lived;
+	{
+		MyThread short_lived;
+		//Start a thread at the beginning of the scope
 
 		DoStuff();
 
-		//Wait for the 10 threads to finish
-	}
-\end{cfacode}
-
-However, one of the apparent drawbacks of this system is that threads now always form a lattice, that is they are always destroyed in opposite order of construction because of block structure. However, storage allocation os not limited to blocks; dynamic allocation can create threads that outlive the scope in which the thread is created much like dynamically allocating memory lets objects outlive the scope in which they are created
-
-\begin{cfacode}
-	thread MyThread {
-		//...
-	};
-
-	//main
-	void main(MyThread* this) {
-		//...
-	}
-
-	void foo() {
-		MyThread* long_lived;
-		{
-			MyThread short_lived;
-			//Start a thread at the beginning of the scope
-
-			DoStuff();
-
-			//create another thread that will outlive the thread in this scope
-			long_lived = new MyThread;
-
-			//Wait for the thread short_lived to finish
-		}
-		DoMoreStuff();
-
-		//Now wait for the short_lived to finish
-		delete long_lived;
-	}
-\end{cfacode}
+		//create another thread that will outlive the thread in this scope
+		long_lived = new MyThread;
+
+		//Wait for the thread short_lived to finish
+	}
+	DoMoreStuff();
+
+	//Now wait for the short_lived to finish
+	delete long_lived;
+}
+\end{cfacode}
Index: doc/proposals/concurrency/text/cforall.tex
===================================================================
--- doc/proposals/concurrency/text/cforall.tex	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/text/cforall.tex	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -4,2 +4,96 @@
 % ======================================================================
 % ======================================================================
+
+As mentionned in the introduction, the document presents the design for the concurrency features in \CFA. Since it is a new language here is a quick review of the language specifically tailored to the features needed to support concurrency.
+
+\CFA is a extension of ISO C and therefore supports much of the same paradigms as C. It is a non-object oriented system level language, meaning it has very most of the major abstractions have either no runtime cost or can be opt-out easily. Like C, the basics of \CFA revolve around structures and routines, which are thin abstractions over assembly. The vast majority of the code produced by a \CFA compiler respects memory-layouts and calling-conventions laid out by C. However, while \CFA is not an object-oriented language according to a strict definition. It does have some notion of objects, most importantly construction and destruction of objects. Most of the following pieces of code can be found as is on the \CFA website : \cite{www-cfa}
+
+\section{References}
+
+Like \CC, \CFA introduces references as an alternative to pointers. In regards to concurrency, the semantics difference between pointers and references aren't particularly relevant but since this document uses mostly references here is a quick overview of the semantics :
+\begin{cfacode}
+int x, *p1 = &x, **p2 = &p1, ***p3 = &p2,
+&r1 = x,    &&r2 = r1,   &&&r3 = r2;
+***p3 = 3;					// change x
+r3 = 3;						// change x, ***r3
+**p3 = ...;					// change p1
+&r3 = ...;					// change r1, (&*)**r3
+*p3 = ...;					// change p2
+&&r3 = ...;					// change r2, (&(&*)*)*r3
+&&&r3 = p3;					// change r3 to p3, (&(&(&*)*)*)r3
+int y, z, & ar[3] = { x, y, z };		// initialize array of references
+&ar[1] = &z;					// change reference array element
+typeof( ar[1] ) p;				// is int, i.e., the type of referenced object
+typeof( &ar[1] ) q;				// is int &, i.e., the type of reference
+sizeof( ar[1] ) == sizeof( int );		// is true, i.e., the size of referenced object
+sizeof( &ar[1] ) == sizeof( int *);		// is true, i.e., the size of a reference
+\end{cfacode}
+The important thing to take away from this code snippet is that references offer a handle to an object much like pointers but which is automatically derefferenced when convinient.
+
+\section{Overloading}
+
+Another important feature \CFA has in common with \CC is function overloading :
+\begin{cfacode}
+// selection based on type and number of parameters
+void f( void );					// (1)
+void f( char );					// (2)
+void f( int, double );				// (3)
+f();						// select (1)
+f( 'a' );					// select (2)
+f( 3, 5.2 );					// select (3)
+
+// selection based on  type and number of returns
+char f( int );					// (1)
+double f( int );				// (2)
+[ int, double ] f( int );			// (3)
+char c = f( 3 );				// select (1)
+double d = f( 4 );				// select (2)
+[ int, double ] t = f( 5 );			// select (3)
+\end{cfacode}
+This feature is particularly important for concurrency since the runtime system relies on creating different types do represent concurrency objects. Therefore, overloading is necessary to prevent the need for long prefixes and other naming conventions that prevent clashes. As seen in chapter \ref{basics}, the main is an example of routine that benefits from overloading when concurrency in introduced.
+
+\section{Operators}
+Overloading also extends to operators. The syntax for denoting operator-overloading is to name a routine with the symbol of the operator and question marks where the arguments of the operation would be, like so :
+\begin{cfacode}
+int ++?( int op );              		// unary prefix increment
+int ?++( int op );              		// unary postfix increment
+int ?+?( int op1, int op2 );    		// binary plus
+int ?<=?( int op1, int op2 );   		// binary less than
+int ?=?( int & op1, int op2 );  		// binary assignment
+int ?+=?( int & op1, int op2 ); 		// binary plus-assignment
+
+struct S { int i, j; };
+S ?+?( S op1, S op2 ) {				// add two structures
+	return (S){ op1.i + op2.i, op1.j + op2.j };
+}
+S s1 = { 1, 2 }, s2 = { 2, 3 }, s3;
+s3 = s1 + s2;					// compute sum: s3 == { 2, 5 }
+\end{cfacode}
+
+Since concurrency does not use operator overloading, this feature is more important as an introduction for the syntax of constructors.
+
+\section{Constructors/Destructors}
+\CFA uses the following syntax for constructors and destructors :
+\begin{cfacode}
+struct S {
+	size_t size;
+	int * ia;
+};
+void ?{}( S & s, int asize ) with s {		// constructor operator
+	size = asize;				// initialize fields
+	ia = calloc( size, sizeof( S ) );
+}
+void ^?{}( S & s ) with s {			// destructor operator
+	free( ia );				// de-initialization fields
+}
+int main() {
+	S x = { 10 }, y = { 100 };		// implict calls: ?{}( x, 10 ), ?{}( y, 100 )
+	...					// use x and y
+	^x{};  ^y{};				// explicit calls to de-initialize
+	x{ 20 };  y{ 200 };			// explicit calls to reinitialize
+	...					// reuse x and y
+}						// implict calls: ^?{}( y ), ^?{}( x )
+\end{cfacode}
+The language guarantees that every object and all their fields are constructed. Like \CC construction is automatically done on declaration and destruction done when the declared variables reach the end of its scope.
+
+For more information see \cite{cforall-ug,rob-thesis,www-cfa}.
Index: doc/proposals/concurrency/text/concurrency.tex
===================================================================
--- doc/proposals/concurrency/text/concurrency.tex	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/text/concurrency.tex	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -300,5 +300,5 @@
 % ======================================================================
 % ======================================================================
-It easier to understand the problem of multi-monitor scheduling using a series of pseudo-code. Note that for simplicity in the following snippets of pseudo-code, waiting and signalling is done using an implicit condition variable, like Java built-in monitors.
+It is easier to understand the problem of multi-monitor scheduling using a series of pseudo-code. Note that for simplicity in the following snippets of pseudo-code, waiting and signalling is done using an implicit condition variable, like Java built-in monitors.
 
 \begin{multicols}{2}
@@ -397,5 +397,5 @@
 \end{center}
 
-It is particularly important to pay attention to code sections 8 and 3, which are where the existing semantics of internal scheduling need to be extended for multiple monitors. The root of the problem is that \gls{group-acquire} is used in a context where one of the monitors is already acquired and is why it is important to define the behaviour of the previous pseudo-code. When the signaller thread reaches the location where it should "release A \& B" (line 16), it must actually transfer ownership of monitor B to the waiting thread. This ownership trasnfer is required in order to prevent barging. Since the signalling thread still needs the monitor A, simply waking up the waiting thread is not an option because it would violate mutual exclusion. There are three options:
+It is particularly important to pay attention to code sections 8 and 4, which are where the existing semantics of internal scheduling need to be extended for multiple monitors. The root of the problem is that \gls{group-acquire} is used in a context where one of the monitors is already acquired and is why it is important to define the behaviour of the previous pseudo-code. When the signaller thread reaches the location where it should "release A \& B" (line 16), it must actually transfer ownership of monitor B to the waiting thread. This ownership trasnfer is required in order to prevent barging. Since the signalling thread still needs the monitor A, simply waking up the waiting thread is not an option because it would violate mutual exclusion. There are three options:
 
 \subsubsection{Delaying signals}
@@ -467,5 +467,5 @@
 Note that ordering is not determined by a race condition but by whether signalled threads are enqueued in FIFO or FILO order. However, regardless of the answer, users can move line 15 before line 11 and get the reverse effect.
 
-In both cases however, the threads need to be able to distinguish on a per monitor basis which ones need to be released and which ones need to be transferred. Which means monitors cannot be handled as a single homogenous group.
+In both cases, the threads need to be able to distinguish on a per monitor basis which ones need to be released and which ones need to be transferred. Which means monitors cannot be handled as a single homogenous group.
 
 \subsubsection{Dependency graphs}
@@ -497,5 +497,5 @@
 Resolving dependency graph being a complex and expensive endeavour, this solution is not the preffered one.
 
-\subsubsection{Partial signalling}
+\subsubsection{Partial signalling} \label{partial-sig}
 Finally, the solution that is chosen for \CFA is to use partial signalling. Consider the following case:
 
@@ -605,9 +605,57 @@
 % ======================================================================
 % ======================================================================
-\subsection{Internal scheduling: Implementation} \label{insched-impl}
-% ======================================================================
-% ======================================================================
-\TODO
-
+\subsection{Internal scheduling: Implementation} \label{inschedimpl}
+% ======================================================================
+% ======================================================================
+There are several challenges specific to \CFA when implementing internal scheduling. These challenges are direct results of \gls{group-acquire} and loose object definitions. These two constraints are to root cause of most design decisions in the implementation of internal scheduling. Furthermore, to avoid the head-aches of dynamically allocating memory in a concurrent environment, the internal-scheduling design is entirely free of mallocs and other dynamic memory allocation scheme. This is to avoid the chicken and egg problem of having a memory allocator that relies on the threading system and a threading system that relies on the runtime. This extra goal, means that memory management is a constant concern in the design of the system.
+
+The main memory concern for concurrency is queues. All blocking operations are made by parking threads onto queues. These queues need to be intrinsic\cit to avoid the need memory allocation. This entails that all the fields needed to keep track of all needed information. Since internal scheduling can use an unbound amount of memory (depending on \gls{group-acquire}) statically defining information information in the intrusive fields of threads is insufficient. The only variable sized container that does not require memory allocation is the callstack, which is heavily used in the implementation of internal scheduling. Particularly the GCC extension variable length arrays which is used extensively.
+
+Since stack allocation is based around scope, the first step of the implementation is to identify the scopes that are available to store the information, and which of these can have a variable length. In the case of external scheduling, the threads and the condition both allow a fixed amount of memory to be stored, while mutex-routines and the actual blocking call allow for an unbound amount (though adding too much to the mutex routine stack size can become expansive faster).
+
+The following figure is the traditionnal illustration of a monitor :
+
+\begin{center}
+{\resizebox{0.4\textwidth}{!}{\input{monitor}}}
+\end{center}
+
+For \CFA, the previous picture does not have support for blocking multiple monitors on a single condition. To support \gls{group-acquire} two changes to this picture are required. First, it doesn't make sense to tie the condition to a single monitor since blocking two monitors as one would require arbitrarily picking a monitor to hold the condition. Secondly, the object waiting on the conditions and AS-stack cannot simply contain the waiting thread since a single thread can potentially wait on multiple monitors. As mentionned in section \ref{inschedimpl}, the handling in multiple monitors is done by partially passing, which entails that each concerned monitor needs to have a node object. However, for waiting on the condition, since all threads need to wait together, a single object needs to be queued in the condition. Moving out the condition and updating the node types yields :
+
+\begin{center}
+{\resizebox{0.8\textwidth}{!}{\input{int_monitor}}}
+\end{center}
+
+\newpage
+
+This picture and the proper entry and leave algorithms is the fundamental implementation of internal scheduling.
+
+\begin{multicols}{2}
+Entry
+\begin{pseudo}[numbers=left]
+if monitor is free
+	enter
+elif I already own the monitor
+	continue
+else
+	block
+increment recursion
+
+\end{pseudo}
+\columnbreak
+Exit
+\begin{pseudo}[numbers=left, firstnumber=8]
+decrement recursion
+if recursion == 0
+	if signal_stack not empty
+		set_owner to thread
+		if all monitors ready
+			wake-up thread
+
+	if entry queue not empty
+		wake-up thread
+\end{pseudo}
+\end{multicols}
+
+Some important things to notice about the exit routine. The solution discussed in \ref{inschedimpl} can be seen on line 11 of the previous pseudo code. Basically, the solution boils down to having a seperate data structure for the condition queue and the AS-stack, and unconditionally transferring ownership of the monitors but only unblocking the thread when the last monitor has trasnferred ownership. This solution is safe as well as preventing any potential barging.
 
 % ======================================================================
@@ -644,5 +692,5 @@
 		inUse = true;
 	}
-	void g() {
+	void V() {
 		inUse = false;
 
@@ -652,7 +700,7 @@
 \end{tabular}
 \end{center}
-This method is more constrained and explicit, which may help users tone down the undeterministic nature of concurrency. Indeed, as the following examples demonstrates, external scheduling allows users to wait for events from other threads without the concern of unrelated events occuring. External scheduling can generally be done either in terms of control flow (e.g. \uC) or in terms of data (e.g. Go). Of course, both of these paradigms have their own strenghts and weaknesses but for this project control flow semantics where chosen to stay consistent with the rest of the languages semantics. Two challenges specific to \CFA arise when trying to add external scheduling with loose object definitions and multi-monitor routines. The following example shows a simple use \code{accept} versus \code{wait}/\code{signal} and its advantages.
-
-In the case of internal scheduling, the call to \code{wait} only guarantees that \code{g} is the last routine to access the monitor. This entails that the routine \code{f} may have acquired mutual exclusion several times while routine \code{h} was waiting. On the other hand, external scheduling guarantees that while routine \code{h} was waiting, no routine other than \code{g} could acquire the monitor.
+This method is more constrained and explicit, which may help users tone down the undeterministic nature of concurrency. Indeed, as the following examples demonstrates, external scheduling allows users to wait for events from other threads without the concern of unrelated events occuring. External scheduling can generally be done either in terms of control flow (e.g., \uC) or in terms of data (e.g. Go). Of course, both of these paradigms have their own strenghts and weaknesses but for this project control-flow semantics were chosen to stay consistent with the rest of the languages semantics. Two challenges specific to \CFA arise when trying to add external scheduling with loose object definitions and multi-monitor routines. The previous example shows a simple use \code{_Accept} versus \code{wait}/\code{signal} and its advantages. Note that while other languages often use \code{accept} as the core external scheduling keyword, \CFA uses \code{waitfor} to prevent name collisions with existing socket APIs.
+
+In the case of internal scheduling, the call to \code{wait} only guarantees that \code{V} is the last routine to access the monitor. This entails that the routine \code{V} may have acquired mutual exclusion several times while routine \code{P} was waiting. On the other hand, external scheduling guarantees that while routine \code{P} was waiting, no routine other than \code{V} could acquire the monitor.
 
 % ======================================================================
@@ -667,8 +715,11 @@
 
 	void f(A & mutex a);
-	void g(A & mutex a) { accept(f); }
-\end{cfacode}
-
-However, external scheduling is an example where implementation constraints become visible from the interface. Indeed, since there is no hard limit to the number of threads trying to acquire a monitor concurrently, performance is a significant concern. Here is the pseudo code for the entering phase of a monitor:
+	void f(int a, float b);
+	void g(A & mutex a) {
+		waitfor(f); // Less obvious which f() to wait for
+	}
+\end{cfacode}
+
+Furthermore, external scheduling is an example where implementation constraints become visible from the interface. Indeed, since there is no hard limit to the number of threads trying to acquire a monitor concurrently, performance is a significant concern. Here is the pseudo code for the entering phase of a monitor:
 
 \begin{center}
@@ -677,4 +728,6 @@
 	if monitor is free
 		enter
+	elif I already own the monitor
+		continue
 	elif monitor accepts me
 		enter
@@ -685,5 +738,5 @@
 \end{center}
 
-For the \pscode{monitor is free} condition it is easy to implement a check that can evaluate the condition in a few instruction. However, a fast check for \pscode{monitor accepts me} is much harder to implement depending on the constraints put on the monitors. Indeed, monitors are often expressed as an entry queue and some acceptor queue as in the following figure:
+For the fist two conditions, it is easy to implement a check that can evaluate the condition in a few instruction. However, a fast check for \pscode{monitor accepts me} is much harder to implement depending on the constraints put on the monitors. Indeed, monitors are often expressed as an entry queue and some acceptor queue as in the following figure:
 
 \begin{center}
@@ -691,5 +744,5 @@
 \end{center}
 
-There are other alternatives to these pictures but in the case of this picture implementing a fast accept check is relatively easy. Indeed simply updating a bitmask when the acceptor queue changes is enough to have a check that executes in a single instruction, even with a fairly large number (e.g. 128) of mutex members. However, this relies on the fact that all the acceptable routines are declared with the monitor type. For OO languages this does not compromise much since monitors already have an exhaustive list of member routines. However, for \CFA this is not the case; routines can be added to a type anywhere after its declaration. Its important to note that the bitmask approach does not actually require an exhaustive list of routines, but it requires a dense unique ordering of routines with an upper-bound and that ordering must be consistent across translation units.
+There are other alternatives to these pictures but in the case of this picture implementing a fast accept check is relatively easy. Indeed simply updating a bitmask when the acceptor queue changes is enough to have a check that executes in a single instruction, even with a fairly large number (e.g. 128) of mutex members. This technique cannot be used in \CFA because it relies on the fact that the monitor type declares all the acceptable routines. For OO languages this does not compromise much since monitors already have an exhaustive list of member routines. However, for \CFA this is not the case; routines can be added to a type anywhere after its declaration. Its important to note that the bitmask approach does not actually require an exhaustive list of routines, but it requires a dense unique ordering of routines with an upper-bound and that ordering must be consistent across translation units.
 The alternative would be to have a picture more like this one:
 
@@ -698,55 +751,9 @@
 \end{center}
 
-Not storing the queues inside the monitor means that the storage can vary between routines, allowing for more flexibility and extensions. Storing an array of function-pointers would solve the issue of uniquely identifying acceptable routines. However, the single instruction bitmask compare has been replaced by dereferencing a pointer followed by a linear search. Furthermore, supporting nested external scheduling may now require additionnal searches on calls to accept to check if a routine is already queued in.
-
-At this point we must make a decision between flexibility and performance. Many design decisions in \CFA achieve both flexibility and performance, for example polymorphic routines add significant flexibility but inlining them means the optimizer can easily remove any runtime cost. Here however, the cost of flexibility cannot be trivially removed.
-
-In either cases here are a few alternatives for the different syntaxes this syntax : \\
-\begin{center}
-{\renewcommand{\arraystretch}{1.5}
-\begin{tabular}[t]{l @{\hskip 0.35in} l}
-\hline
-\multicolumn{2}{ c }{\code{accept} on type}\\
-\hline
-Alternative 1 & Alternative 2 \\
-\begin{lstlisting}
-mutex struct A
-accept( void f(A & mutex a) )
-{};
-\end{lstlisting} &\begin{lstlisting}
-mutex struct A {}
-accept( void f(A & mutex a) );
-
-\end{lstlisting} \\
-Alternative 3 & Alternative 4 \\
-\begin{lstlisting}
-mutex struct A {
-	accept( void f(A & mutex a) )
-};
-
-\end{lstlisting} &\begin{lstlisting}
-mutex struct A {
-	accept :
-		void f(A & mutex a) );
-};
-\end{lstlisting}\\
-\hline
-\multicolumn{2}{ c }{\code{accept} on routine}\\
-\hline
-\begin{lstlisting}
-mutex struct A {};
-
-void f(A & mutex a)
-
-accept( void f(A & mutex a) )
-void g(A & mutex a) {
-	/*...*/
-}
-\end{lstlisting}&\\
-\end{tabular}
-}
-\end{center}
-
-Another aspect to consider is what happens if multiple overloads of the same routine are used. For the time being it is assumed that multiple overloads of the same routine should be scheduled regardless of the overload used. However, this could easily be extended in the future.
+Not storing the queues inside the monitor means that the storage can vary between routines, allowing for more flexibility and extensions. Storing an array of function-pointers would solve the issue of uniquely identifying acceptable routines. However, the single instruction bitmask compare has been replaced by dereferencing a pointer followed by a linear search. Furthermore, supporting nested external scheduling may now require additionnal searches on calls to waitfor to check if a routine is already queued in.
+
+At this point we must make a decision between flexibility and performance. Many design decisions in \CFA achieve both flexibility and performance, for example polymorphic routines add significant flexibility but inlining them means the optimizer can easily remove any runtime cost. Here however, the cost of flexibility cannot be trivially removed. In the end, the most flexible approach has been chosen since it allows users to write programs that would otherwise be prohibitively hard to write. This is based on the assumption that writing fast but inflexible locks is closer to a solved problems than writing locks that are as flexible as external scheduling in \CFA.
+
+Another aspect to consider is what happens if multiple overloads of the same routine are used. For the time being it is assumed that multiple overloads of the same routine are considered as distinct routines. However, this could easily be extended in the future.
 
 % ======================================================================
@@ -758,5 +765,4 @@
 External scheduling, like internal scheduling, becomes orders of magnitude more complex when we start introducing multi-monitor syntax. Even in the simplest possible case some new semantics need to be established:
 \begin{cfacode}
-	accept( void f(mutex struct A & mutex this))
 	mutex struct A {};
 
@@ -764,5 +770,5 @@
 
 	void g(A & mutex a, B & mutex b) {
-		accept(f); //ambiguous, which monitor
+		waitfor(f); //ambiguous, which monitor
 	}
 \end{cfacode}
@@ -771,5 +777,4 @@
 
 \begin{cfacode}
-	accept( void f(mutex struct A & mutex this))
 	mutex struct A {};
 
@@ -777,12 +782,11 @@
 
 	void g(A & mutex a, B & mutex b) {
-		accept( b, f );
-	}
-\end{cfacode}
-
-This is unambiguous. Both locks will be acquired and kept, when routine \code{f} is called the lock for monitor \code{a} will be temporarily transferred from \code{g} to \code{f} (while \code{g} still holds lock \code{b}). This behavior can be extended to multi-monitor accept statment as follows.
-
-\begin{cfacode}
-	accept( void f(mutex struct A & mutex, mutex struct A & mutex))
+		waitfor( f, b );
+	}
+\end{cfacode}
+
+This is unambiguous. Both locks will be acquired and kept, when routine \code{f} is called the lock for monitor \code{b} will be temporarily transferred from \code{g} to \code{f} (while \code{g} still holds lock \code{a}). This behavior can be extended to multi-monitor waitfor statment as follows.
+
+\begin{cfacode}
 	mutex struct A {};
 
@@ -790,9 +794,34 @@
 
 	void g(A & mutex a, B & mutex b) {
-		accept( b, a, f);
-	}
-\end{cfacode}
-
-Note that the set of monitors passed to the \code{accept} statement must be entirely contained in the set of monitor already acquired in the routine. \code{accept} used in any other context is Undefined Behaviour.
+		waitfor( f, a, b);
+	}
+\end{cfacode}
+
+Note that the set of monitors passed to the \code{waitfor} statement must be entirely contained in the set of monitor already acquired in the routine. \code{waitfor} used in any other context is Undefined Behaviour.
+
+An important behavior to note is that what happens when set of monitors only match partially :
+
+\begin{cfacode}
+	mutex struct A {};
+
+	mutex struct B {};
+
+	void g(A & mutex a, B & mutex b) {
+		waitfor(f, a, b);
+	}
+
+	A a1, a2;
+	B b;
+
+	void foo() {
+		g(a1, b);
+	}
+
+	void bar() {
+		f(a2, b);
+	}
+\end{cfacode}
+
+While the equivalent can happen when using internal scheduling, the fact that conditions are branded on first use means that users have to use two different condition variables. In both cases, partially matching monitor sets will not wake-up the waiting thread. It is also important to note that in the case of external scheduling, as for routine calls, the order of parameters is important; \code{waitfor(f,a,b)} and \code{waitfor(f,b,a)} are to distinct waiting condition.
 
 % ======================================================================
Index: doc/proposals/concurrency/version
===================================================================
--- doc/proposals/concurrency/version	(revision c3b9667793ab5af3235b25e29ee243e76415f0ad)
+++ doc/proposals/concurrency/version	(revision e2f7bc3f75223dd833821863a884160e203bb19d)
@@ -1,1 +1,1 @@
-0.9.122
+0.9.180
