Still fucking around with getting fields right