PHYS-7 #comment Can't really remember what all I did here. Been way too
long since I looked at this stuff/committed.