Adds Velocity source and resolves the majestic OOP of this code
Velocity inherits base classes virtually in order to avoid operator ambiguity