Reorganized and added to examples, some progress on functionality