Initial Design
Merge Conflicts fixed