updated functioning

works now, gotta style next