Added framework and some functionality to OO version of main code.