Wrote down some TODO items for next time...