Closes #5 - Finishes sprinkling logging all around