Adding basic checkin.  Cleaning up code.