Working on fixing auto-fill

IELD. It's the shit, man.