Added some comments and stubs