Mostly complete in terms of class organization will have working level by tommorow midday