Committing 2,3,4 of main.. Should work.. can't test yet.
Committing more use cases from the main
Merge pull request #27 from Hartman2/master

Part of Main done