finished first jab at models and wrote tests