Initial craven version
Merged/fixed conflicting files