updated w/ debug + working form