Overview

Milestone 1 - done
Milestone 2 - done
Milestone 3