Third commit, revised lab 2 startup and finished lab 1