Version close to final, still missing svg arrows