More entity madness!

Now we can export and import!