Updated Lab2

Made some additions, changes and general crazyness.