Added functionality

Thinking about starting over though. I never added in basic test
conditions, so I think that it would be best to restart.