Fill in missing methods. Rewrite is probably needed at this point.