Renamed some stuff. Created a utility class for field lists to make working with them a little more natural. More tests.