Initial attempt at models files complete