bleh, db update, needs fixage