Bugs fixed, containment imports work

Can now import subject entities with appropriate spatial containment.