Added some functionality

I never know what to describe beyond the header.