Updated for lab 3, not finished