Committing the latest working version before I attempt to download and install velocity...