working, need validations
remove finalize