#5 Entry fields (merge & WIP)