Updated functionality.
Cleaned up working files.