Finish up _fields partial