Experimental dev work
This is another change on dev
I think I fixed bug 6
Merged dev to master