Issues 1-3

Commiting so the issues match what is visible on github.