one and two done, includes tex tables