Finished more functionality
Merge pull request #3 from jcolomer/new_branch

Finished more functionality