-adding some more TODOs, dont know if im able to finish this today.