Trying to finish this