deleted stuff
integrated stuff
merge fix
added vectors and stuff