Added all functionality

yep
Merge pull request #1 from TimelyToga/Second

Added all functionality