formatting
form fixed
form added
figuring out end logic