Committing some debug as I need to test on the server.