First commit
Merges with new project