Jas 71

Big commit, a lot of work done
fixes #71 

I also want to test if my comments with fixes on the commits in this pull request work