Basic implementation
Add tests
Update indexing tests