Adding Finished, issue #1