Various changes, started working on an
elasticsearch backend