Adding vector logic!
Merge branch 'vector'