Adding comments and expanding for future function

Adding comments and expanding for future functionality.