Reworking Models to run properly