Move promotion over to datashape #123