diff -r 204dc77e5654 -r 7c4a63a02632 src/model.h
--- a/src/model.h	Sat Mar 07 01:25:37 2020 +0200
+++ b/src/model.h	Mon Mar 09 22:12:50 2020 +0200
@@ -49,7 +49,7 @@
 	template<typename R>
 	ldraw::Id<R> checkType(ldraw::id_t id) const;
 	template<typename R>
-	const R* get(ldraw::Id<R> id) const;
+	const R* get(ldraw::Id<R> id, QModelIndex* index_out = nullptr) const;
 signals:
 	void objectAdded(ldraw::id_t id, int position);
 private:
@@ -58,7 +58,8 @@
 	ldraw::Id<T> append(Args&&... args);
 	void append(ModelObjectPointer&& object);
 	template<typename T, typename... Args>
-	ldraw::Id<T> insert(int position, Args&&... args);
+	ldraw::Id<T> insert(std::size_t position, Args&&... args);
+	void remove(int position);
 	ldraw::Object* objectAt(const QModelIndex& index);
 	const ldraw::Object* objectAt(const QModelIndex& index) const;
 	template<typename T>
@@ -109,25 +110,30 @@
 	this->body.push_back(std::make_unique<T>(args...));
 	ldraw::Object* pointer = this->body.back().get();
 	this->objectsById[pointer->id] = pointer;
-	emit objectAdded(pointer->id, this->body.size() - 1);
+	emit objectAdded(pointer->id, static_cast<int>(this->body.size() - 1));
 	emit layoutChanged();
-	return ldraw::Id<T>{pointer->id};
+	return ldraw::Id<T>{pointer->id.value};
 }
 
 template<typename T, typename... Args>
-ldraw::Id<T> Model::insert(int position, Args&&... args)
+ldraw::Id<T> Model::insert(std::size_t position, Args&&... args)
 {
 	emit layoutAboutToBeChanged();
-	this->body.insert(position, std::make_unique<T>(args...));
+	this->body.insert(std::begin(this->body) + position, std::make_unique<T>(args...));
 	ldraw::Object* pointer = this->body[position].get();
 	this->objectsById[pointer->id] = pointer;
-	emit objectAdded(pointer->id, position);
+	emit objectAdded(pointer->id, static_cast<int>(position));
 	emit layoutChanged();
-	return ldraw::Id<T>{pointer->id};
+	return ldraw::Id<T>{pointer->id.value};
 }
 
 template<typename R>
-const R* Model::get(ldraw::Id<R> id) const
+const R* Model::get(ldraw::Id<R> id, QModelIndex* index_out) const
 {
-	return this->objectAt(id);
+	QModelIndex index = this->lookup(id);
+	if (index_out != nullptr)
+	{
+		*index_out = index;
+	}
+	return static_cast<const R*>(this->objectAt(index));
 }