Add more logging

Closes #7