A bit more consistency
Add todos