More functionality!
Merge pull request #1 from NicheInc/testbranch

More functionality!