halfway through 02 draft two

still need some restructuring