Finished up some more functions