Finalization

Close to being done.