db refactoring. breaks api! told you so