Clean Attempt

Fresh start (I think), with a big help from SteveKoontz