Switch and updated to do list

I tweaked some of the code and updated the to do list.