Merge conflicts
Add skeleton implementation