Another overhaul

A list to large to keep track of.
Probably the final version now.
Has yet to be tested to work outside of a local network.