Updated TODO and fixes

I updated the Commands.c to reduce the double walk.  Added return values
back to the main function.  Removed all conflicts so it should now
compile and run correctly.  Need to remove some prints that I have
going.