Added unlinkables to entity model.
Several changes to web project.  Slight refactoring to come.