All the basics are covered. Reorganized file structure.  Needs tests.