Lucas branch

Merging.