Updated specifications and implemented everything except betweenness. LOTS of debugging needed