Added more code. In progress checkin. Not working.