Finished a few methods