Fix #39 - First run stuff

Very cool