Finished Me Fixes #1

Test