Remove extras, for now. Update tests. Works.
Update README