Make primary functionality complete