First actual code checkin, seems to work.