Added janky custom fields - still need to add tests