Preparing Data Model
Refactoring Overlay Views