Draft solution
Add logs
Clean up