q1 almost done...adding magic numbers fields and some mix ups