Lots of changes, worked with Ajay on editing the relationships

Updated a lot of models, views and control classes to allow editing of
the relationships between objects