Started adding trignometric simplification