Ported Victor W2

Cleaned her up a little more.