First commit
Cleaned up commented-out code
Added support for config file.