Clean Attempt

Fresh start (I think), with a big help from SteveKoontz
Merge pull request #534 from CoalPoweredPuppet/master

Clean Attempt