Implemented needed classes. Updated TODO.