Refactored A LOT of the fields listing/each-loop! Also some other refactoring.