Refactor in progress
Implemented vector and successfull tests
Merge branch 'Vector'