#396 Added logging
#396 Added todo