Add TODO's, separate L1 into two scripts