Updates

Closes #13 
Closes #16 
New line before this.