Added some comments, got apigen to work