finished a few more methods