Second commit; LAB 2 is now dip compliant
Third commit; LAB 2 dip compliant; fixing other best practice errors