Now seems to work in basic implementation.