Rewrote code for fields, should work now