senritsu-finally sorta finished that redraw