Finishes basic demo features