[AOP]Preliminary commit for lab 1