Added Object Oriented take on the 'main' file