Debug logging and todo added