currently broken, change getType to getSaveableType and add missing instances