Updated lots of stuff

Switched everything over to a brute-force US system