Added logging code
Added logging messages
testing?
Final commit, if it works...