Filled in some of the missing methods.