finished tinkering for the night, fixing where fields get data from.