Wrote more code, still need validation.