Finising lab2....still kludgey