Commented some code out to get it all to compile
Added test of logic code to main file, test seems to go well