index on master: 409b312 delete
WIP on master: 409b312 delete
fix routes too
merge