Still working on getting multipartentity working