Commit to merge with current code
Fixed merge conflicts
Failing tests for disproving suggestions written