Librato

## Not ready to be merged yet