Overhaul of systems and functions.
Merge remote-tracking branch 'orgxeno/master'