I agree and left some TODOs. This is a little harder. I might come back to this, but not right now.