Added classes for A4Q2, Ready to implement