Merge pull request #30 from MarkTonkinson/master

To do almost functioning
To do is functioning