Finished a few more functions