First commit with cake code
Merging