Added all fields, still needs lots of work