Now with functions! 

Wooooooooo
Merge pull request #1 from EChisholm/master

Now with functions!