Added fields functionality

Nothing fancy, hope it's clean