fiddling around, looks like a mess
reordering some parts, this code is a mess
Reordering, still in need for a major rewrite..
WiP
tidying stuff
Merge pull request #3 from blefaudeux/ben

Ben