WIP
WIP
WIP
WIP
fixed up bugs etc
New version of gargamel

All tested, and documentation added