Reworking some model stuff