Draft!

By the way, my type.xml stopped working again…