Still fixing code, but getting some of it checked in just in case.