added some model stuff etc