Last Commit before scrapping raven db in lieu of sql :(