changing from set to vector
merging
Merge branch 'master' of github.com:Luanhssa/ap
still not working, but almost there