merged todo with mattleong