yeah the large blocks of code being commented out worry me, a TODO or some explanation for each one would be nice