Added addneighbours and pass boolean instead of cli

addNeighbours added to deal with functional groups
No longer passing cli to StucturalFormula, passing boolean instead.