Added some debug code, need to fix w2+w1 still