Some stripe progress and a lot more TODOs