Fixed setting instance fields, good enough to turn in