Concept changes, more tests, readme