WIP: Don't store fields