Removed ops classes and chopped makefile
Added operation functions and got a compileable project + makefile
testing changes in driver
Fixed merge conflicts