Initial Pull Request - More features complete, new demo

Still a lot more to complete, will continue work on this when I get more free time. Figured we can merge the work and get a new release out. Then we can continue to implement everything and move towards version 1.0 with everything complete.