- Add more TODOs :) and some checks