Updated vertex class some more

Still not finalised but need to sync to get it on my laptop.