Added a bunch more loggin