Cleaning up some code here and there. Making sure to not assume only one field type. Making it possible to choose more than one field type