More changes from Emily
Merge pull request #2 from craftninja/emily_has_more_changes

More changes from Emily