More todo'ish things added.