dk 1 and 4 update, initial commit of tp1-2