Merge pull request #7 from markableidinger/working

Trying to make these branches work