Edit #1 taking shape.