Made some updates

Added some functionality
Merge remote-tracking branch 'origin/Whizbang'