* Knocking out some TODOs