Merge of etai and greg manually onto shappy branch
Fixed up super merge added lots of TODOs