Updated many of the classes to include proper settings and removed a lot of cruft. This is ready to be tested thoroughly.
