Initial commit of new description code (warning: broken!)