Build #3

-added more functionality and comments