Finished Lab2

Integrated with lab 1 and added executor class