Making some progress, found a couple of errors