DO NOT MERGE
For the moment these are straight copies of 1707 and 17A7 with a new line "ElectronLoose".