adding comments and some helper stubs