You should remove the changes you made in the dischageCells() method, and put them in a separate branch and pull request. That way we can get your -1 support in in one pull request, and the discharge cells algorithm improvements in in another. Also, that will allow the -1 support to go in without any problems as master has been updated with some new refactoring. We can do this tomorrow if you want