Added a little documentation, more method stubs