converted all OneToOneFields to ForeignKeys