Moved almost everything to oop design but errors still occur
Tidy code but still seg faulting