hybrid stuff
Merge pull request #4 from breanneee/master

hybrid stuff