pulling fields out into their own repository