Little nicer, add todo