End of Milestone

Fixes #6 
Fixes #7