First Completed Draft (2.0)

Fixed matrix elements