database saves temporarily disabled, needs refactoring