ENH: First draft done... almost ready