Minor changes, developing Finalize functionality locally