Syncing with current code

Won’t let me pull without pushing. Changed some of the TODOs though so
this isn’t a completely pointless push I guess :/
Merge branch 'master' of https://github.com/dean13-meet/Electric-Field-Mapping

Got a conflict in main, I don’t think it pushed so repushing