My final commit. Cleaned up code and got rid of features that didn't do
anything or never worked. [axof:235]