Refactoring

Pushed a couple of methods back up the hierarchy so they can be used by
all modesl
More refactoring
More refactoring and fix bug on sports dates