Refactored model

Collapsed all the various models into a single one