FInishing functionality

From testing, it works