Initial commit of Lucure
Fixing conflicts
Trying to fix unit tests