Updated Models, Added Rakefile