Redo

Reworked approach. Invisible fields don't work.