Update todo list
Merge github/existing robot code.

I probably broke some things. We need to test it out