Adding comments and starting to add tests