added TODO list
added some more methods