Refactor, consolidate db code into models.  Move track logic out of server model