Add all field to makefile
Start on megan edits