Cleaned up and finished Lab6