Continuing to develop the samesign section, rewrote most of it