Added todos
Added countable interface