Code mostly complete, pushing to test README.md