Working on some more features, comments.