TODO updates. Further class development.