added TODO list; added few tests;