Switched to pointers;
Better architecture;