Filled in some more method implementations