[WIP] Add end() method