Added a 2d vector class and simplified alot!