Did some stuff. Not done, and probably not working.
Merge pull request #2 from bearbin/dev

Did some stuff. Not done, and probably not working.