Add my solution
Remove TODO comments