Lab 2 done

Part of lab 3 also