lots modularizing

lots of new features
adding fromAdd and toAdd processing