Initial Checkin
Updated code